Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-06 05:25:41 -05:00
Code Packages Releases Activity

modals: more focus fixes

Browse Source
This commit is contained in:
bbedward
2025-11-10 09:40:28 -05:00
parent 7b3d2ab85a
commit af95631a1d
3 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Modals/Common/DankModal.qml
View File

@@ -52,11 +52,15 @@ PanelWindow {
closeTimer.stop()
shouldBeVisible = true
visible = true
focusScope.forceActiveFocus()
shouldHaveFocus = false
Qt.callLater(() => {
shouldHaveFocus = Qt.binding(() => shouldBeVisible)
})
}
function close() {
shouldBeVisible = false
shouldHaveFocus = false
closeTimer.restart()
}
@@ -76,11 +80,6 @@ PanelWindow {
onVisibleChanged: {
if (root.visible) {
opened()
Qt.callLater(() => {
if (shouldHaveFocus) {
focusScope.forceActiveFocus()
}
})
} else {
if (Qt.inputMethod) {
Qt.inputMethod.hide()
@@ -90,12 +89,6 @@ PanelWindow {
}
}
onShouldHaveFocusChanged: {
if (shouldHaveFocus && shouldBeVisible && visible) {
Qt.callLater(() => focusScope.forceActiveFocus())
}
}
Connections {
function onCloseAllModalsExcept(excludedModal) {
if (excludedModal !== root && !allowStacking && shouldBeVisible) {
@@ -315,20 +308,5 @@ PanelWindow {
event.accepted = true
}
}
onVisibleChanged: {
if (visible && shouldHaveFocus) {
Qt.callLater(() => focusScope.forceActiveFocus())
}
}
Connections {
function onShouldHaveFocusChanged() {
if (shouldHaveFocus && shouldBeVisible) {
Qt.callLater(() => focusScope.forceActiveFocus())
}
}
target: root
}
}
}

15
Modules/Settings/PluginBrowser.qml
View File

@@ -122,6 +122,17 @@ DankModal {
refreshPlugins()
}
Connections {
target: contentLoader
function onLoaded() {
Qt.callLater(() => {
if (contentLoader.item && contentLoader.item.searchField) {
contentLoader.item.searchField.forceActiveFocus()
}
})
}
}
onDialogClosed: () => {
allPlugins = []
searchQuery = ""
@@ -143,6 +154,10 @@ DankModal {
anchors.fill: parent
focus: true
Component.onCompleted: {
browserSearchField.forceActiveFocus()
}
Keys.onPressed: event => {
if (event.key === Qt.Key_Escape) {
root.close()

28
translations/en.json
View File

@@ -44,7 +44,7 @@
{
"term": "3rd party",
"context": "3rd party",
"reference": "Modules/Settings/PluginBrowser.qml:413",
"reference": "Modules/Settings/PluginBrowser.qml:428",
"comment": ""
},
{
@@ -542,7 +542,7 @@
{
"term": "Browse Plugins",
"context": "Browse Plugins",
"reference": "Modules/Settings/PluginBrowser.qml:182",
"reference": "Modules/Settings/PluginBrowser.qml:197",
"comment": ""
},
{
@@ -590,7 +590,7 @@
{
"term": "Cancel",
"context": "Cancel",
"reference": "Modals/BluetoothPairingModal.qml:251, Modals/PolkitAuthModal.qml:291, Modals/WifiPasswordModal.qml:494, Modals/FileBrowser/FileBrowserOverwriteDialog.qml:83, Modules/Settings/PluginBrowser.qml:635",
"reference": "Modals/BluetoothPairingModal.qml:251, Modals/PolkitAuthModal.qml:291, Modals/WifiPasswordModal.qml:494, Modals/FileBrowser/FileBrowserOverwriteDialog.qml:83, Modules/Settings/PluginBrowser.qml:650",
"comment": ""
},
{
@@ -1796,7 +1796,7 @@
{
"term": "I Understand",
"context": "I Understand",
"reference": "Modules/Settings/PluginBrowser.qml:641",
"reference": "Modules/Settings/PluginBrowser.qml:656",
"comment": ""
},
{
@@ -1880,7 +1880,7 @@
{
"term": "Install plugins from the DMS plugin registry",
"context": "Install plugins from the DMS plugin registry",
"reference": "Modules/Settings/PluginBrowser.qml:236",
"reference": "Modules/Settings/PluginBrowser.qml:251",
"comment": ""
},
{
@@ -2036,7 +2036,7 @@
{
"term": "Loading plugins...",
"context": "Loading plugins...",
"reference": "Modules/Settings/PluginBrowser.qml:304",
"reference": "Modules/Settings/PluginBrowser.qml:319",
"comment": ""
},
{
@@ -2450,7 +2450,7 @@
{
"term": "No plugins found",
"context": "No plugins found",
"reference": "Modules/Settings/PluginBrowser.qml:538",
"reference": "Modules/Settings/PluginBrowser.qml:553",
"comment": ""
},
{
@@ -3146,7 +3146,7 @@
{
"term": "Search plugins...",
"context": "Search plugins...",
"reference": "Modules/Settings/PluginBrowser.qml:260",
"reference": "Modules/Settings/PluginBrowser.qml:275",
"comment": ""
},
{
@@ -3686,13 +3686,13 @@
{
"term": "Third-Party Plugin Warning",
"context": "Third-Party Plugin Warning",
"reference": "Modules/Settings/PluginBrowser.qml:586",
"reference": "Modules/Settings/PluginBrowser.qml:601",
"comment": ""
},
{
"term": "Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\\n\\nThese plugins may pose security and privacy risks - install at your own risk.",
"context": "Third-party plugins are created by the community and are not officially supported by DankMaterialShell.\\n\\nThese plugins may pose security and privacy risks - install at your own risk.",
"reference": "Modules/Settings/PluginBrowser.qml:596",
"reference": "Modules/Settings/PluginBrowser.qml:611",
"comment": ""
},
{
@@ -4178,7 +4178,7 @@
{
"term": "official",
"context": "official",
"reference": "Modules/Settings/PluginBrowser.qml:393",
"reference": "Modules/Settings/PluginBrowser.qml:408",
"comment": ""
},
{
@@ -4190,7 +4190,7 @@
{
"term": "• Install only from trusted sources",
"context": "• Install only from trusted sources",
"reference": "Modules/Settings/PluginBrowser.qml:619",
"reference": "Modules/Settings/PluginBrowser.qml:634",
"comment": ""
},
{
@@ -4220,13 +4220,13 @@
{
"term": "• Plugins may contain bugs or security issues",
"context": "• Plugins may contain bugs or security issues",
"reference": "Modules/Settings/PluginBrowser.qml:607",
"reference": "Modules/Settings/PluginBrowser.qml:622",
"comment": ""
},
{
"term": "• Review code before installation when possible",
"context": "• Review code before installation when possible",
"reference": "Modules/Settings/PluginBrowser.qml:613",
"reference": "Modules/Settings/PluginBrowser.qml:628",
"comment": ""
},
{