From afe8df5020d575ee361078aa3bd52706f818dee4 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Thu, 1 Nov 2018 22:10:51 -0400
Subject: qt: Add UI to configure touchscreen parameters This allows adjusting
 the finger, diameter, and angle of the emulated touchscreen. It also provides
 a warning to the user about what changing these parameters can do.

---
 .../configuration/configure_touchscreen_advanced.h | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 src/yuzu/configuration/configure_touchscreen_advanced.h

(limited to 'src/yuzu/configuration/configure_touchscreen_advanced.h')

diff --git a/src/yuzu/configuration/configure_touchscreen_advanced.h b/src/yuzu/configuration/configure_touchscreen_advanced.h
new file mode 100644
index 000000000..938a62ed3
--- /dev/null
+++ b/src/yuzu/configuration/configure_touchscreen_advanced.h
@@ -0,0 +1,31 @@
+// Copyright 2016 Citra Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <memory>
+#include <QDialog>
+#include <QWidget>
+#include "yuzu/configuration/config.h"
+
+namespace Ui {
+class ConfigureTouchscreenAdvanced;
+}
+
+class ConfigureTouchscreenAdvanced : public QDialog {
+    Q_OBJECT
+
+public:
+    explicit ConfigureTouchscreenAdvanced(QWidget* parent);
+
+    void applyConfiguration();
+
+private:
+    /// Load configuration settings.
+    void loadConfiguration();
+    /// Restore all buttons to their default values.
+    void restoreDefaults();
+
+    std::unique_ptr<Ui::ConfigureTouchscreenAdvanced> ui;
+};
-- 
cgit v1.2.3


From 3a6cd5b3c8dec11cc88c6aebdc4773233f615c91 Mon Sep 17 00:00:00 2001
From: Zach Hilman <zachhilman@gmail.com>
Date: Sat, 3 Nov 2018 12:55:39 -0400
Subject: hid: Use player-defined controller type as PREFERRED_CONTROLLER

---
 src/yuzu/configuration/configure_touchscreen_advanced.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/yuzu/configuration/configure_touchscreen_advanced.h')

diff --git a/src/yuzu/configuration/configure_touchscreen_advanced.h b/src/yuzu/configuration/configure_touchscreen_advanced.h
index 938a62ed3..41cd255fb 100644
--- a/src/yuzu/configuration/configure_touchscreen_advanced.h
+++ b/src/yuzu/configuration/configure_touchscreen_advanced.h
@@ -18,6 +18,7 @@ class ConfigureTouchscreenAdvanced : public QDialog {
 
 public:
     explicit ConfigureTouchscreenAdvanced(QWidget* parent);
+    ~ConfigureTouchscreenAdvanced() override;
 
     void applyConfiguration();
 
-- 
cgit v1.2.3