Qt buildfix, apply feedback

hrydgard · Nov 27, 2022 · 689860b · 689860b
1 parent 0a3d782
commit 689860b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/Qt/mainwindow.cpp b/Qt/mainwindow.cpp
@@ -589,7 +589,7 @@ void MainWindow::createMenus()
 	MenuTree* gameSettingsMenu = new MenuTree(this, menuBar(), QT_TR_NOOP("&Game settings"));
 	gameSettingsMenu->add(new MenuAction(this, SLOT(languageAct()),        QT_TR_NOOP("La&nguage...")));
 	gameSettingsMenu->add(new MenuAction(this, SLOT(controlMappingAct()),        QT_TR_NOOP("C&ontrol mapping...")));
-	gameSettingsMenu->add(new MenuAction(this, SLOT(displayLayoutEditorAct()),        QT_TR_NOOP("Display layout editor...")));
+	gameSettingsMenu->add(new MenuAction(this, SLOT(displayLayoutEditorAct()),        QT_TR_NOOP("Display layout & effects...")));
 	gameSettingsMenu->add(new MenuAction(this, SLOT(moreSettingsAct()),        QT_TR_NOOP("&More settings...")));
 	gameSettingsMenu->addSeparator();
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)

diff --git a/Qt/mainwindow.h b/Qt/mainwindow.h
@@ -130,10 +130,6 @@ private slots:
 	}
 	void windowGroup_triggered(QAction *action) { SetWindowScale(action->data().toInt()); }
 
-	void displayLayoutGroup_triggered(QAction *action) {
-		g_Config.iSmallDisplayZoomType = action->data().toInt();
-		NativeMessageReceived("gpu_displayResized", "");
-	}
 	void autoframeskipAct() {
 		g_Config.bAutoFrameSkip = !g_Config.bAutoFrameSkip;
 		if (g_Config.bSkipBufferEffects) {

diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp
@@ -598,7 +598,7 @@ bool PSPCustomStick::Touch(const TouchInput &input) {
 			retval = true;
 		}
 	}
-	return true;
+	return retval;
 }
 
 void PSPCustomStick::ProcessTouch(float x, float y, bool down) {