Merge branch 'main' of github.com:noctalia-dev/noctalia-shell

Modules/Bar/Widgets/KeyboardLayout.qml

@@ -13,6 +13,26 @@ Item {
   property ShellScreen screen
   property real scaling: 1.0
 
+  // Widget properties passed from Bar.qml for per-instance settings
+  property string widgetId: ""
+  property string barSection: ""
+  property int sectionWidgetIndex: -1
+  property int sectionWidgetsCount: 0
+
+  property var widgetMetadata: BarWidgetRegistry.widgetMetadata[widgetId]
+  property var widgetSettings: {
+    var section = barSection.replace("Section", "").toLowerCase()
+    if (section && sectionWidgetIndex >= 0) {
+      var widgets = Settings.data.bar.widgets[section]
+      if (widgets && sectionWidgetIndex < widgets.length) {
+        return widgets[sectionWidgetIndex]
+      }
+    }
+    return {}
+  }
+
+  readonly property bool forceOpen: (widgetSettings.forceOpen !== undefined) ? widgetSettings.forceOpen : widgetMetadata.forceOpen
+
   // Use the shared service for keyboard layout
   property string currentLayout: KeyboardLayoutService.currentLayout
 
@@ -26,8 +46,10 @@ Item {
     rightOpen: BarWidgetRegistry.getNPillDirection(root)
     icon: "keyboard"
     autoHide: false // Important to be false so we can hover as long as we want
-    text: currentLayout
-    tooltipText: "Keyboard layout: " + currentLayout
+    text: currentLayout.toUpperCase()
+    tooltipText: "Keyboard layout: " + currentLayout.toUpperCase()
+    forceOpen: root.forceOpen
+    fontSize: Style.fontSizeS // Use larger font size
 
     onClicked: {
 

Modules/PowerPanel/PowerPanel.qml

@@ -224,6 +224,7 @@ NPanel {
           root.close()
         }
       }
+      context: Qt.WidgetShortcut
       enabled: root.opened
     }
 

Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml

@@ -46,6 +46,7 @@ Popup {
       "Brightness": "WidgetSettings/BrightnessSettings.qml",
       "Clock": "WidgetSettings/ClockSettings.qml",
       "CustomButton": "WidgetSettings/CustomButtonSettings.qml",
+      "KeyboardLayout": "WidgetSettings/KeyboardLayoutSettings.qml",
       "MediaMini": "WidgetSettings/MediaMiniSettings.qml",
       "Microphone": "WidgetSettings/MicrophoneSettings.qml",
       "NotificationHistory": "WidgetSettings/NotificationHistorySettings.qml",

Modules/SettingsPanel/Bar/WidgetSettings/KeyboardLayoutSettings.qml

@@ -0,0 +1,31 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import qs.Commons
+import qs.Widgets
+import qs.Services
+
+ColumnLayout {
+  id: root
+  spacing: Style.marginM * scaling
+
+  // Properties to receive data from parent
+  property var widgetData: null
+  property var widgetMetadata: null
+
+  // Local state
+  property bool valueForceOpen: widgetData.forceOpen !== undefined ? widgetData.forceOpen : widgetMetadata.forceOpen
+
+  function saveSettings() {
+    var settings = Object.assign({}, widgetData || {})
+    settings.forceOpen = valueForceOpen
+    return settings
+  }
+
+  NToggle {
+    label: "Force open"
+    description: "Keep the keyboard layout widget always expanded."
+    checked: valueForceOpen
+    onToggled: checked => valueForceOpen = checked
+  }
+}