qt: keep focus on "Hide" while ModalOverlay is visible

jadijadi · jadijadi · commit 992b1bbd5da9 · 2024-02-17T17:52:28.000+03:30
During the initial sync, the Tab moves the focus to the widgets of the main window, even when the ModalOverlay is visible. This creates some weird rectangular *selections on the screen*. This PR fixes this by keeping the focus on the "Hide" button while the ModalOverlay is visible. Fixes #783
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
@@ -23,6 +23,7 @@ ModalOverlay::ModalOverlay(bool enable_wallet, QWidget* parent)
         parent->installEventFilter(this);
         raise();
     }
+    ui->closeButton->installEventFilter(this);
 
     blockProcessTime.clear();
     setVisible(false);
@@ -58,6 +59,11 @@ bool ModalOverlay::eventFilter(QObject * obj, QEvent * ev) {
             raise();
         }
     }
+
+    if (obj == ui->closeButton && ev->type() == QEvent::FocusOut && layerIsVisible) {
+        ui->closeButton->setFocus(Qt::OtherFocusReason);
+    }
+
     return QWidget::eventFilter(obj, ev);
 }
 
@@ -185,6 +191,10 @@ void ModalOverlay::showHide(bool hide, bool userRequested)
     m_animation.setEndValue(QPoint(0, hide ? height() : 0));
     m_animation.start(QAbstractAnimation::KeepWhenStopped);
     layerIsVisible = !hide;
+
+    if (layerIsVisible) {
+        ui->closeButton->setFocus(Qt::OtherFocusReason);
+    }
 }
 
 void ModalOverlay::closeClicked()

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ ModalOverlay::ModalOverlay(bool enable_wallet, QWidget* parent)`
`23`	`23`	`parent->installEventFilter(this);`
`24`	`24`	`raise();`
`25`	`25`	`}`
	`26`	`+ ui->closeButton->installEventFilter(this);`
`26`	`27`
`27`	`28`	`blockProcessTime.clear();`
`28`	`29`	`setVisible(false);`
`@@ -58,6 +59,11 @@ bool ModalOverlay::eventFilter(QObject * obj, QEvent * ev) {`
`58`	`59`	`raise();`
`59`	`60`	`}`
`60`	`61`	`}`
	`62`	`+`
	`63`	`+ if (obj == ui->closeButton && ev->type() == QEvent::FocusOut && layerIsVisible) {`
	`64`	`+ ui->closeButton->setFocus(Qt::OtherFocusReason);`
	`65`	`+ }`
	`66`	`+`
`61`	`67`	`return QWidget::eventFilter(obj, ev);`
`62`	`68`	`}`
`63`	`69`
`@@ -185,6 +191,10 @@ void ModalOverlay::showHide(bool hide, bool userRequested)`
`185`	`191`	`m_animation.setEndValue(QPoint(0, hide ? height() : 0));`
`186`	`192`	`m_animation.start(QAbstractAnimation::KeepWhenStopped);`
`187`	`193`	`layerIsVisible = !hide;`
	`194`	`+`
	`195`	`+ if (layerIsVisible) {`
	`196`	`+ ui->closeButton->setFocus(Qt::OtherFocusReason);`
	`197`	`+ }`
`188`	`198`	`}`
`189`	`199`
`190`	`200`	`void ModalOverlay::closeClicked()`