Address review comments and fix code compilation
This commit is contained in:
parent
e6bd1fd1b8
commit
d176feffad
13 changed files with 218 additions and 155 deletions
|
@ -9,8 +9,6 @@
|
|||
#include <optional>
|
||||
#include <vector>
|
||||
#include <QDialog>
|
||||
#include "core/frontend/framebuffer_layout.h"
|
||||
#include "core/settings.h"
|
||||
|
||||
class QItemSelection;
|
||||
class QModelIndex;
|
||||
|
@ -18,6 +16,10 @@ class QStandardItemModel;
|
|||
class QStandardItem;
|
||||
class QTimer;
|
||||
|
||||
namespace InputCommon {
|
||||
class InputSubsystem;
|
||||
}
|
||||
|
||||
namespace Common {
|
||||
class ParamPackage;
|
||||
}
|
||||
|
@ -32,12 +34,17 @@ namespace Ui {
|
|||
class ConfigureTouchFromButton;
|
||||
}
|
||||
|
||||
namespace Settings {
|
||||
struct TouchFromButtonMap;
|
||||
}
|
||||
|
||||
class ConfigureTouchFromButton : public QDialog {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit ConfigureTouchFromButton(QWidget* parent,
|
||||
const std::vector<Settings::TouchFromButtonMap>& touch_maps,
|
||||
InputCommon::InputSubsystem* input_subsystem_,
|
||||
int default_index = 0);
|
||||
~ConfigureTouchFromButton() override;
|
||||
|
||||
|
@ -51,8 +58,8 @@ public slots:
|
|||
void SetCoordinates(int dot_id, const QPoint& pos);
|
||||
|
||||
protected:
|
||||
virtual void showEvent(QShowEvent* ev) override;
|
||||
virtual void keyPressEvent(QKeyEvent* event) override;
|
||||
void showEvent(QShowEvent* ev) override;
|
||||
void keyPressEvent(QKeyEvent* event) override;
|
||||
|
||||
private slots:
|
||||
void NewMapping();
|
||||
|
@ -73,10 +80,12 @@ private:
|
|||
void SaveCurrentMapping();
|
||||
|
||||
std::unique_ptr<Ui::ConfigureTouchFromButton> ui;
|
||||
std::unique_ptr<QStandardItemModel> binding_list_model;
|
||||
std::vector<Settings::TouchFromButtonMap> touch_maps;
|
||||
QStandardItemModel* binding_list_model;
|
||||
int selected_index;
|
||||
|
||||
InputCommon::InputSubsystem* input_subsystem;
|
||||
|
||||
std::unique_ptr<QTimer> timeout_timer;
|
||||
std::unique_ptr<QTimer> poll_timer;
|
||||
std::vector<std::unique_ptr<InputCommon::Polling::DevicePoller>> device_pollers;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue