From 46ad7bbd382efecfe41e26ba2d7ccca2abbe24c5 Mon Sep 17 00:00:00 2001
From: Fritz Mahnke <fritz@mahnke.tech>
Date: Mon, 17 Apr 2023 08:06:24 -0700
Subject: [PATCH] Remove redundant setFocus call, which actually removes focus.

Under i3wm 4.21.1/Qt 6.4.1, the existing code actually removes keyboard focus
from the newly-activated window. Removing the call to setFocus in these cases
fixes the problem. The call to activateWindow is enough to put keyboard focus on
it.

The documentation for activateWindow implies the same.
---
 src/drivers/Qt/CheatsConf.cpp                | 1 -
 src/drivers/Qt/CodeDataLogger.cpp            | 1 -
 src/drivers/Qt/ConsoleDebugger.cpp           | 1 -
 src/drivers/Qt/FamilyKeyboard.cpp            | 1 -
 src/drivers/Qt/HexEditor.cpp                 | 1 -
 src/drivers/Qt/NameTableViewer.cpp           | 1 -
 src/drivers/Qt/TasEditor/TasEditorWindow.cpp | 2 --
 src/drivers/Qt/TraceLogger.cpp               | 1 -
 src/drivers/Qt/ppuViewer.cpp                 | 2 --
 9 files changed, 11 deletions(-)

diff --git a/src/drivers/Qt/CheatsConf.cpp b/src/drivers/Qt/CheatsConf.cpp
index a67ef5af..bd918a3b 100644
--- a/src/drivers/Qt/CheatsConf.cpp
+++ b/src/drivers/Qt/CheatsConf.cpp
@@ -54,7 +54,6 @@ void openCheatDialog(QWidget *parent)
 	{
 		win->activateWindow();
 		win->raise();
-		win->setFocus();
 		return;
 	}
 	win = new GuiCheatsDialog_t(parent);
diff --git a/src/drivers/Qt/CodeDataLogger.cpp b/src/drivers/Qt/CodeDataLogger.cpp
index 8d6b5908..50b2032a 100644
--- a/src/drivers/Qt/CodeDataLogger.cpp
+++ b/src/drivers/Qt/CodeDataLogger.cpp
@@ -63,7 +63,6 @@ int openCDLWindow( QWidget *parent )
 	{
 		cdlWin->activateWindow();
 		cdlWin->raise();
-		cdlWin->setFocus();
 	}
 	else
 	{
diff --git a/src/drivers/Qt/ConsoleDebugger.cpp b/src/drivers/Qt/ConsoleDebugger.cpp
index fe10d82a..20c06510 100644
--- a/src/drivers/Qt/ConsoleDebugger.cpp
+++ b/src/drivers/Qt/ConsoleDebugger.cpp
@@ -4548,7 +4548,6 @@ void debuggerWindowSetFocus(bool val)
 	{
 		dbgWin->activateWindow();
 		dbgWin->raise();
-		dbgWin->setFocus();
 	}
 }
 //----------------------------------------------------------------------------
diff --git a/src/drivers/Qt/FamilyKeyboard.cpp b/src/drivers/Qt/FamilyKeyboard.cpp
index 3ee9c1fa..dcf4f229 100644
--- a/src/drivers/Qt/FamilyKeyboard.cpp
+++ b/src/drivers/Qt/FamilyKeyboard.cpp
@@ -126,7 +126,6 @@ int openFamilyKeyboardDialog(QWidget *parent)
 	{
 		fkbWin->activateWindow();
 		fkbWin->raise();
-		fkbWin->setFocus();
 	}
 	else
 	{
diff --git a/src/drivers/Qt/HexEditor.cpp b/src/drivers/Qt/HexEditor.cpp
index 04f1365d..decf6ba2 100644
--- a/src/drivers/Qt/HexEditor.cpp
+++ b/src/drivers/Qt/HexEditor.cpp
@@ -4222,7 +4222,6 @@ int hexEditorOpenFromDebugger( int mode, int addr )
 	{
 		win->activateWindow();
 		win->raise();
-		win->setFocus();
 	}
 
 	win->editor->setMode( mode );
diff --git a/src/drivers/Qt/NameTableViewer.cpp b/src/drivers/Qt/NameTableViewer.cpp
index 631da5d4..abdfaf35 100644
--- a/src/drivers/Qt/NameTableViewer.cpp
+++ b/src/drivers/Qt/NameTableViewer.cpp
@@ -108,7 +108,6 @@ int openNameTableViewWindow( QWidget *parent )
 	{
 		nameTableViewWindow->activateWindow();
 		nameTableViewWindow->raise();
-		nameTableViewWindow->setFocus();
 		return -1;
 	}
 	initNameTableViewer();
diff --git a/src/drivers/Qt/TasEditor/TasEditorWindow.cpp b/src/drivers/Qt/TasEditor/TasEditorWindow.cpp
index c7314be9..c2167a4e 100644
--- a/src/drivers/Qt/TasEditor/TasEditorWindow.cpp
+++ b/src/drivers/Qt/TasEditor/TasEditorWindow.cpp
@@ -116,7 +116,6 @@ void tasWindowSetFocus(bool val)
 	{
 		tasWin->activateWindow();
 		tasWin->raise();
-		tasWin->setFocus();
 	}
 }
 // this getter contains formula to decide whether to record or replay movie
@@ -2917,7 +2916,6 @@ void TasEditorWindow::openFindNoteWindow(void)
 	{
 		findWin->activateWindow();
 		findWin->raise();
-		findWin->setFocus();
 	}
 	else
 	{
diff --git a/src/drivers/Qt/TraceLogger.cpp b/src/drivers/Qt/TraceLogger.cpp
index b8fe13b4..55459615 100644
--- a/src/drivers/Qt/TraceLogger.cpp
+++ b/src/drivers/Qt/TraceLogger.cpp
@@ -1211,7 +1211,6 @@ void openTraceLoggerWindow(QWidget *parent)
 	{
 		traceLogWindow->activateWindow();
 		traceLogWindow->raise();
-		traceLogWindow->setFocus();
 		return;
 	}
 	//printf("Open Trace Logger Window\n");
diff --git a/src/drivers/Qt/ppuViewer.cpp b/src/drivers/Qt/ppuViewer.cpp
index d151da42..91b8a38d 100644
--- a/src/drivers/Qt/ppuViewer.cpp
+++ b/src/drivers/Qt/ppuViewer.cpp
@@ -92,7 +92,6 @@ int openPPUViewWindow( QWidget *parent )
 	{
 		ppuViewWindow->activateWindow();
 		ppuViewWindow->raise();
-		ppuViewWindow->setFocus();
 		return -1;
 	}
 	initPPUViewer();
@@ -110,7 +109,6 @@ int openOAMViewWindow( QWidget *parent )
 	{
 		spriteViewWindow->activateWindow();
 		spriteViewWindow->raise();
-		spriteViewWindow->setFocus();
 		return -1;
 	}
 	initPPUViewer();