lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

widget-settings: properly close when clicking on a second screen

Browse Source
This commit is contained in:
Lemmy
2026-01-23 16:47:57 -05:00
parent 70be6a7ecb
commit 01da5520d4
1 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Widgets/NSectionEditor.qml
+22
View File
@@ -39,6 +39,16 @@ NBox {
property var widgetRegistry: null
property string settingsDialogComponent: "BarWidgetSettingsDialog.qml"
property var screen: null // Screen reference for per-screen widget settings
property var _activeDialog: null
Component.onDestruction: {
if (_activeDialog && _activeDialog.close) {
var dialog = _activeDialog;
_activeDialog = null;
dialog.close();
dialog.destroy();
}
}
readonly property int gridColumns: 3
readonly property real miniButtonSize: Style.baseWidgetSize * 0.65
@@ -442,6 +452,11 @@ NBox {
// Handle core widget settings
var component = Qt.createComponent(Qt.resolvedUrl(root.settingsDialogComponent));
function instantiateAndOpen() {
if (root._activeDialog) {
root._activeDialog.close();
root._activeDialog.destroy();
root._activeDialog = null;
}
var dialog = component.createObject(Overlay.overlay, {
"widgetIndex": index,
"widgetData": modelData,
@@ -450,7 +465,14 @@ NBox {
"screen": root.screen
});
if (dialog) {
root._activeDialog = dialog;
dialog.updateWidgetSettings.connect(root.updateWidgetSettings);
dialog.closed.connect(() => {
if (root._activeDialog === dialog) {
root._activeDialog = null;
dialog.destroy();
}
});
dialog.open();
} else {
Logger.e("NSectionEditor", "Failed to create settings dialog instance");