|
|
Changed |
emumaster_0.3.1.tar.gz/src/base/.touchinputdevice.cpp.swp
|
|
|
Deleted |
emumaster_0.3.1.tar.gz/src/base/.touchinputdevice.h.swp
^
|
|
[-]
[+]
|
Changed |
emumaster_0.3.1.tar.gz/src/base/touchinputdevice.cpp
^
|
| @@ -60,12 +60,6 @@
m_picoButtonsEnable(false),
m_gbaButtonsEnable(false)
{
- setupEmuFunctionList();
-
- QObject::connect(this, SIGNAL(emuFunctionChanged()), SLOT(onEmuFunctionChanged()));
-
- m_buttonsImage.load(pathManager.installationDirPath()+"/data/buttons.png");
-
QSettings settings;
settings.setValue("inputDevice/test", "testSetting");
@@ -78,6 +72,10 @@
ButtonWidth = settings.value("inputDevice/ButtonWidth", 256).toInt();
ButtonHeight = settings.value("inputDevice/ButtonHeight", 192).toInt();
PaintedButtonSize = settings.value("inputDevice/PaintedButtonSize", 192).toInt();
+
+ setupEmuFunctionList();
+ QObject::connect(this, SIGNAL(emuFunctionChanged()), SLOT(onEmuFunctionChanged()));
+ m_buttonsImage.load(pathManager.installationDirPath()+"/data/buttons.png");
}
//void TouchInputDevice::setHostVideo(HostVideo *hostVideo)
@@ -333,7 +331,7 @@
void TouchInputDevice::setDpadAreaSize(int size)
{
- int rSize = qBound(160, size, 320);
+ int rSize = qBound(160, size, 8192);
if (m_areaSize != rSize) {
m_areaSize = rSize;
setDpadAreaDiagonalSize(m_diagonalAreaSize);
|
