More theming

Modules/Bar/Bar.qml

@@ -14,6 +14,8 @@ PanelWindow {
   screen: modelData
   implicitHeight: Style.barHeight * scaling
   color: "transparent"
+  visible: Settings.settings.barMonitors.includes(modelData.name)
+           || (Settings.settings.barMonitors.length === 0)
 
   anchors {
     top: true
@@ -25,13 +27,47 @@ PanelWindow {
     anchors.fill: parent
 
     Rectangle {
+      id: bar
       anchors.fill: parent
       color: Colors.backgroundPrimary
       layer.enabled: true
     }
 
-    // Testing widgets
-    RowLayout {
+    Row {
+      id: leftSection
+      anchors.left: bar.left
+      anchors.leftMargin: Style.marginMedium * scaling
+      anchors.verticalCenter: bar.verticalCenter
+      spacing: Style.marginMedium * scaling
+
+      NText {
+        text: "Left"
+      }
+    }
+
+    Row {
+      id: centerSection
+      anchors.horizontalCenter: parent.horizontalCenter
+      anchors.verticalCenter: bar.verticalCenter
+      spacing: Style.marginMedium * scaling
+      NText {
+        text: "Center"
+      }
+    }
+
+    Row {
+      id: rightSection
+
+      anchors.right: bar.right
+      anchors.rightMargin: Style.marginMedium * scaling
+      anchors.verticalCenter: bar.verticalCenter
+      spacing: Style.marginMedium * scaling
+
+      NText {
+        text: "Right"
+      }
+
+      Clock {}
 
       NIconButton {
         id: demoPanelToggler
@@ -40,8 +76,6 @@ PanelWindow {
           demoPanel.visible ? demoPanel.hide() : demoPanel.show()
         }
       }
-
-      Clock {}
     }
   }
 }

Modules/Bar/Clock.qml

@@ -11,13 +11,9 @@ Rectangle {
   height: textItem.paintedHeight
   color: "transparent"
 
-  Text {
+  NText {
     id: textItem
     text: Time.time
-    font.family: Settings.settings.fontFamily
-    font.weight: Font.Bold
-    font.pointSize: Style.fontMedium * scaling
-    color: Colors.textPrimary
     anchors.centerIn: parent
   }
 
@@ -36,9 +32,7 @@ Rectangle {
     }
     onClicked: function () {
       calendar.visible = !calendar.visible
-      if (calendar.visible) {
-        tooltip.hide()
-      }
+      tooltip.hide()
     }
   }
 

Modules/DemoPanel/DemoPanel.qml

@@ -20,7 +20,7 @@ NPanel {
     color: Colors.backgroundPrimary
     radius: Style.radiusMedium * scaling
     border.color: Colors.backgroundTertiary
-    border.width: Math.max(1, 1.5 * scale)
+    border.width: Math.min(1, Style.borderMedium * scaling)
     width: 500 * scaling
     height: 300
     anchors.centerIn: parent
@@ -38,11 +38,10 @@ NPanel {
 
 
       // NIconButton
-      RowLayout {
+      ColumnLayout {
         spacing: 16 * scaling
-        Text {
+        NText {
           text: "NIconButton"
-          color: Colors.textPrimary
         }
 
         NIconButton {
@@ -59,12 +58,11 @@ NPanel {
 
 
       // NToggle
-      RowLayout {
+      ColumnLayout {
         spacing: 16 * scaling
         uniformCellSizes: true
-        Text {
+        NText {
           text: "NToggle + NTooltip"
-          color: Colors.textPrimary
         }
 
         NToggle {
@@ -84,11 +82,10 @@ NPanel {
       }
 
       // NSlider
-      RowLayout {
+      ColumnLayout {
         spacing: 16 * scaling
-        Text {
+        NText {
           text: "NSlider"
-          color: Colors.textPrimary
         }
 
         NSlider {}