Merge pull request #1945 from emrecancorapci/add-bar-padding-setting

Add configurable outer padding for bar

Assets/Translations/de.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Separate Leisten-Deckkraft",
       "appearance-widget-spacing-description": "Den Abstand zwischen jedem Widget in der Leiste anpassen.",
       "appearance-widget-spacing-label": "Widget-Abstand",
+      "appearance-content-padding-description": "Passen Sie den Abstand zwischen Leistenrändern und Widgets an.",
+      "appearance-content-padding-label": "Inhaltsabstand",
       "monitor-configure-widgets": "Widgets konfigurieren",
       "monitor-override-settings": "Globale Einstellungen überschreiben",
       "monitor-override-settings-description": "Benutzerdefinierte Einstellungen für diesen Monitor verwenden.",

Assets/Translations/en.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Use separate bar opacity",
       "appearance-widget-spacing-description": "Adjust the spacing between each widget in the bar.",
       "appearance-widget-spacing-label": "Widget spacing",
+      "appearance-content-padding-description": "Adjust the padding between bar edges and widgets.",
+      "appearance-content-padding-label": "Content padding",
       "monitor-configure-widgets": "Configure widgets",
       "monitor-override-settings": "Override global settings",
       "monitor-override-settings-description": "Use custom settings for this monitor.",

Assets/Translations/es.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Usar opacidad de barra separada",
       "appearance-widget-spacing-description": "Ajusta el espaciado entre cada widget en la barra.",
       "appearance-widget-spacing-label": "Espaciado de widgets",
+      "appearance-content-padding-description": "Ajusta el espacio entre los bordes de la barra y los widgets.",
+      "appearance-content-padding-label": "Espaciado del contenido",
       "monitor-configure-widgets": "Configurar widgets",
       "monitor-override-settings": "Anular la configuración global",
       "monitor-override-settings-description": "Usar ajustes personalizados para este monitor.",

Assets/Translations/fr.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Utiliser l'opacité des barres séparément",
       "appearance-widget-spacing-description": "Ajustez l'espacement entre chaque widget dans la barre.",
       "appearance-widget-spacing-label": "Espacement des widgets",
+      "appearance-content-padding-description": "Ajustez l'espacement entre les bords de la barre et les widgets.",
+      "appearance-content-padding-label": "Espacement du contenu",
       "monitor-configure-widgets": "Configurer les widgets",
       "monitor-override-settings": "Remplacer les paramètres globaux",
       "monitor-override-settings-description": "Utiliser des paramètres personnalisés pour ce moniteur.",

Assets/Translations/hu.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Külön oszlop átlátszóság használata",
       "appearance-widget-spacing-description": "Az egyes widgetek közötti távolság a sávon.",
       "appearance-widget-spacing-label": "Widget távolság",
+      "appearance-content-padding-description": "Állítsd be a távolságot a sáv szélei és a widgetek között.",
+      "appearance-content-padding-label": "Tartalom távolság",
       "monitor-configure-widgets": "Widgetek konfigurálása",
       "monitor-override-settings": "Globális beállítások felülírása",
       "monitor-override-settings-description": "Egyéni beállítások használata ehhez a monitorhoz.",

Assets/Translations/ja.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "バーの不透明度を個別に設定",
       "appearance-widget-spacing-description": "バー内の各ウィジェット間の間隔を調整します。",
       "appearance-widget-spacing-label": "ウィジェットの間隔",
+      "appearance-content-padding-description": "バーの端とウィジェット間のパディングを調整します。",
+      "appearance-content-padding-label": "コンテンツパディング",
       "monitor-configure-widgets": "ウィジェットを設定",
       "monitor-override-settings": "グローバル設定を上書き",
       "monitor-override-settings-description": "このモニターにカスタム設定を使用する。",

Assets/Translations/ko-KR.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "별도 바 불투명도 사용",
       "appearance-widget-spacing-description": "바의 각 위젯 사이 간격을 조정합니다.",
       "appearance-widget-spacing-label": "위젯 간격",
+      "appearance-content-padding-description": "바 가장자리와 위젯 사이의 패딩을 조정합니다.",
+      "appearance-content-padding-label": "콘텐츠 패딩",
       "monitor-configure-widgets": "위젯 구성",
       "monitor-override-settings": "전역 설정 재정의",
       "monitor-override-settings-description": "이 모니터에 사용자 지정 설정을 사용합니다.",

Assets/Translations/nl.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Gebruik afzonderlijke balkdekking",
       "appearance-widget-spacing-description": "Pas de afstand tussen elke widget in de balk aan.",
       "appearance-widget-spacing-label": "Widgetafstand",
+      "appearance-content-padding-description": "Pas de opvulling tussen de baranden en widgets aan.",
+      "appearance-content-padding-label": "Inhoudopvulling",
       "monitor-configure-widgets": "Widgets configureren",
       "monitor-override-settings": "Globale instellingen overschrijven",
       "monitor-override-settings-description": "Gebruik aangepaste instellingen voor deze monitor.",

Assets/Translations/pl.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Użyj osobnej przezroczystości słupków",
       "appearance-widget-spacing-description": "Dostosuj odstępy między każdym widżetem na pasku.",
       "appearance-widget-spacing-label": "Odstępy między widżetami",
+      "appearance-content-padding-description": "Dostosuj odstęp między krawędziami paska a widżetami.",
+      "appearance-content-padding-label": "Odstęp treści",
       "monitor-configure-widgets": "Skonfiguruj widżety",
       "monitor-override-settings": "Zastąp ustawienia globalne",
       "monitor-override-settings-description": "Użyj niestandardowych ustawień dla tego monitora.",

Assets/Translations/pt.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Usar opacidade separada para as barras",
       "appearance-widget-spacing-description": "Ajusta o espaçamento entre cada widget na barra.",
       "appearance-widget-spacing-label": "Espaçamento de widgets",
+      "appearance-content-padding-description": "Ajusta o espaçamento entre as bordas da barra e os widgets.",
+      "appearance-content-padding-label": "Espaçamento do conteúdo",
       "monitor-configure-widgets": "Configurar widgets",
       "monitor-override-settings": "Substituir configurações globais",
       "monitor-override-settings-description": "Usar definições personalizadas para este monitor.",

Assets/Translations/ru.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Использовать раздельную прозрачность столбцов",
       "appearance-widget-spacing-description": "Отрегулируйте интервал между каждым виджетом на панели.",
       "appearance-widget-spacing-label": "Расстояние между виджетами",
+      "appearance-content-padding-description": "Отрегулируйте отступ между краями панели и виджетами.",
+      "appearance-content-padding-label": "Отступ содержимого",
       "monitor-configure-widgets": "Настроить виджеты",
       "monitor-override-settings": "Переопределить глобальные настройки",
       "monitor-override-settings-description": "Использовать пользовательские настройки для этого монитора.",

Assets/Translations/sv.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Använd separat opacitet för fältet",
       "appearance-widget-spacing-description": "Justera avståndet mellan varje widget i fältet.",
       "appearance-widget-spacing-label": "Widgetavstånd",
+      "appearance-content-padding-description": "Justera avståndet mellan fältets kanter och widgetar.",
+      "appearance-content-padding-label": "Innehållsavstånd",
       "monitor-configure-widgets": "Konfigurera widgetar",
       "monitor-override-settings": "Åsidosätt globala inställningar",
       "monitor-override-settings-description": "Använd anpassade inställningar för denna skärm.",

Assets/Translations/tr.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Ayrı çubuk opaklığı kullan",
       "appearance-widget-spacing-description": "Çubuktaki her bir widget arasındaki boşluğu ayarlayın.",
       "appearance-widget-spacing-label": "Widget aralığı",
+      "appearance-content-padding-description": "Çubuk kenarları ile widget'lar arasındaki dolguyu ayarlayın.",
+      "appearance-content-padding-label": "İçerik dolgusu",
       "monitor-configure-widgets": "Araçları yapılandır",
       "monitor-override-settings": "Genel ayarları geçersiz kıl",
       "monitor-override-settings-description": "Bu monitör için özel ayarları kullan.",

Assets/Translations/uk-UA.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "Використовувати окрему прозорість стовпців",
       "appearance-widget-spacing-description": "Налаштуйте інтервал між кожним віджетом на панелі.",
       "appearance-widget-spacing-label": "Відстань між віджетами",
+      "appearance-content-padding-description": "Налаштуйте відступ між краями панелі та віджетами.",
+      "appearance-content-padding-label": "Відступ вмісту",
       "monitor-configure-widgets": "Налаштувати віджети",
       "monitor-override-settings": "Перевизначити глобальні налаштування",
       "monitor-override-settings-description": "Використовувати власні налаштування для цього монітора.",

Assets/Translations/zh-CN.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "使用单独的状态栏不透明度",
       "appearance-widget-spacing-description": "调整栏中每个小部件之间的间距。",
       "appearance-widget-spacing-label": "小部件间距",
+      "appearance-content-padding-description": "调整栏边缘与小部件之间的内边距。",
+      "appearance-content-padding-label": "内容内边距",
       "monitor-configure-widgets": "配置小部件",
       "monitor-override-settings": "覆盖全局设置",
       "monitor-override-settings-description": "为此显示器使用自定义设置。",

Assets/Translations/zh-TW.json

@@ -833,6 +833,8 @@
       "appearance-use-separate-opacity-label": "分開設定工具列不透明度",
       "appearance-widget-spacing-description": "調整列中每個小工具之間的間距。",
       "appearance-widget-spacing-label": "小工具間距",
+      "appearance-content-padding-description": "調整列邊緣與小工具之間的內邊距。",
+      "appearance-content-padding-label": "內容內邊距",
       "monitor-configure-widgets": "設定小工具",
       "monitor-override-settings": "覆寫全域設定",
       "monitor-override-settings-description": "在這個顯示器上使用自訂設定",

Assets/settings-default.json

@@ -10,6 +10,7 @@
     "capsuleOpacity": 1,
     "capsuleColorKey": "none",
     "widgetSpacing": 6,
+    "contentPadding": 0,
     "fontScale": 1,
     "backgroundOpacity": 0.93,
     "useSeparateOpacity": false,

Commons/Settings.qml

@@ -182,6 +182,7 @@ Singleton {
       property real capsuleOpacity: 1.0
       property string capsuleColorKey: "none"
       property int widgetSpacing: 6
+      property int contentPadding: 0
       property real fontScale: 1.0
 
       // Bar background opacity settings

Modules/Bar/Bar.qml

@@ -344,7 +344,7 @@ Item {
       ColumnLayout {
         x: Style.pixelAlignCenter(parent.width, width)
         anchors.top: parent.top
-        anchors.topMargin: verticalBarMargin
+        anchors.topMargin: verticalBarMargin + Settings.data.bar.contentPadding
         spacing: Settings.data.bar.widgetSpacing
 
         Repeater {
@@ -395,7 +395,7 @@ Item {
       ColumnLayout {
         x: Style.pixelAlignCenter(parent.width, width)
         anchors.bottom: parent.bottom
-        anchors.bottomMargin: verticalBarMargin
+        anchors.bottomMargin: verticalBarMargin + Settings.data.bar.contentPadding
         spacing: Settings.data.bar.widgetSpacing
 
         Repeater {
@@ -452,7 +452,7 @@ Item {
         id: leftSection
         objectName: "leftSection"
         anchors.left: parent.left
-        anchors.leftMargin: horizontalBarMargin
+        anchors.leftMargin: horizontalBarMargin + Settings.data.bar.contentPadding
         y: Style.pixelAlignCenter(parent.height, height)
         spacing: Settings.data.bar.widgetSpacing
 
@@ -507,7 +507,7 @@ Item {
         id: rightSection
         objectName: "rightSection"
         anchors.right: parent.right
-        anchors.rightMargin: horizontalBarMargin
+        anchors.rightMargin: horizontalBarMargin + Settings.data.bar.contentPadding
         y: Style.pixelAlignCenter(parent.height, height)
         spacing: Settings.data.bar.widgetSpacing
 

Modules/Panels/Settings/Tabs/Bar/AppearanceSubTab.qml

@@ -168,6 +168,20 @@ ColumnLayout {
     text: Settings.data.bar.widgetSpacing + "px"
   }
 
+  NValueSlider {
+    Layout.fillWidth: true
+    label: I18n.tr("panels.bar.appearance-content-padding-label")
+    description: I18n.tr("panels.bar.appearance-content-padding-description")
+    from: 0
+    to: 30
+    stepSize: 1
+    showReset: true
+    value: Settings.data.bar.contentPadding
+    defaultValue: Settings.getDefaultValue("bar.contentPadding")
+    onMoved: value => Settings.data.bar.contentPadding = value
+    text: Settings.data.bar.contentPadding + "px"
+  }
+
   NToggle {
     Layout.fillWidth: true
     label: I18n.tr("panels.bar.appearance-show-outline-label")