INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-12 22:57:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Address review comments and fix code compilation

Browse Source
This commit is contained in:
FearlessTobi
2020-08-29 20:56:51 +02:00
parent e6bd1fd1b8
commit d176feffad
13 changed files with 218 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/yuzu/configuration/configure_motion_touch.h
View File

@ -7,29 +7,30 @@
#include <memory>
#include <QDialog>
#include "common/param_package.h"
#include "core/settings.h"
#include "input_common/udp/client.h"
#include "input_common/udp/udp.h"
class QVBoxLayout;
class QLabel;
class QPushButton;
class QVBoxLayout;
namespace Ui {
class ConfigureMotionTouch;
}
namespace InputCommon::CemuhookUDP {
class CalibrationConfigurationJob;
}
/// A dialog for touchpad calibration configuration.
class CalibrationConfigurationDialog : public QDialog {
Q_OBJECT
public:
explicit CalibrationConfigurationDialog(QWidget* parent, const std::string& host, u16 port,
u8 pad_index, u16 client_id);
~CalibrationConfigurationDialog();
~CalibrationConfigurationDialog() override;
private:
Q_INVOKABLE void UpdateLabelText(QString text);
Q_INVOKABLE void UpdateButtonText(QString text);
Q_INVOKABLE void UpdateLabelText(const QString& text);
Q_INVOKABLE void UpdateButtonText(const QString& text);
QVBoxLayout* layout;
QLabel* status_label;
@ -38,7 +39,10 @@ private:
// Configuration results
bool completed{};
u16 min_x, min_y, max_x, max_y;
u16 min_x{};
u16 min_y{};
u16 max_x{};
u16 max_y{};
friend class ConfigureMotionTouch;
};
@ -47,7 +51,7 @@ class ConfigureMotionTouch : public QDialog {
Q_OBJECT
public:
explicit ConfigureMotionTouch(QWidget* parent = nullptr);
explicit ConfigureMotionTouch(QWidget* parent, InputCommon::InputSubsystem* input_subsystem_);
~ConfigureMotionTouch() override;
public slots:
@ -69,9 +73,14 @@ private:
std::unique_ptr<Ui::ConfigureMotionTouch> ui;
// Coordinate system of the CemuhookUDP touch provider
int min_x, min_y, max_x, max_y;
int min_x{};
int min_y{};
int max_x{};
int max_y{};
bool udp_test_in_progress{};
InputCommon::InputSubsystem* input_subsystem;
std::vector<Settings::TouchFromButtonMap> touch_from_button_maps;
};