Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restore previous focus after HPopup closed

Browse Source
This commit is contained in:
miruka 2019-12-12 08:39:26 -04:00
parent 1bd012c871
commit 4b13b75617
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qml/Base/HPopup.qml
View File

@ -22,6 +22,11 @@ Popup {
color: theme.controls.popup.background color: theme.controls.popup.background
} }
onAboutToShow: previouslyFocused = window.activeFocusItem
onClosed: if (previouslyFocused) previouslyFocused.forceActiveFocus()
property var previouslyFocused: null
readonly property int maximumPreferredWidth: readonly property int maximumPreferredWidth:
window.width - leftMargin - rightMargin - leftInset - rightInset window.width - leftMargin - rightMargin - leftInset - rightInset

8
src/qml/DebugConsole.qml
View File

@ -17,7 +17,7 @@ HDrawer {
z: 9999 z: 9999
position: 0 position: 0
property var previouslyFocusedItem: null property var previouslyFocused: null
property var target: null property var target: null
property alias t: debugConsole.target property alias t: debugConsole.target
@ -66,10 +66,10 @@ HDrawer {
onVisibleChanged: { onVisibleChanged: {
if (visible) { if (visible) {
previouslyFocusedItem = window.activeFocusItem previouslyFocused = window.activeFocusItem
forceActiveFocus() forceActiveFocus()
} else if (previouslyFocusedItem) { } else if (previouslyFocused) {
previouslyFocusedItem.forceActiveFocus() previouslyFocused.forceActiveFocus()
} }
} }