more toolbars styling, identify Main toolbars [header toolbar, footer…

… toolbar] from secondary toolbar and style them accordingly #3
mauikit · Mar 30, 2018 · 9fdfc52 · 9fdfc52
1 parent fbd507a
commit 9fdfc52
Show file tree

Hide file tree

Showing 67 changed files with 9 additions and 6 deletions.
diff --git a/ApplicationWindow.qmlc b/ApplicationWindow.qmlc
diff --git a/BusyIndicator.qml b/BusyIndicator.qml
diff --git a/BusyIndicator.qmlc b/BusyIndicator.qmlc
diff --git a/Button.qml b/Button.qml
diff --git a/Button.qmlc b/Button.qmlc
diff --git a/CheckBox.qml b/CheckBox.qml
diff --git a/CheckBox.qmlc b/CheckBox.qmlc
diff --git a/CheckDelegate.qml b/CheckDelegate.qml
diff --git a/CheckIndicator.qml b/CheckIndicator.qml
diff --git a/CheckIndicator.qmlc b/CheckIndicator.qmlc
diff --git a/ComboBox.qml b/ComboBox.qml
diff --git a/Container.qml b/Container.qml
diff --git a/Control.qml b/Control.qml
diff --git a/Dial.qml b/Dial.qml
diff --git a/Dialog.qml b/Dialog.qml
diff --git a/Dialog.qmlc b/Dialog.qmlc
diff --git a/DialogButtonBox.qml b/DialogButtonBox.qml
diff --git a/DialogButtonBox.qmlc b/DialogButtonBox.qmlc
diff --git a/Drawer.qml b/Drawer.qml
diff --git a/Drawer.qmlc b/Drawer.qmlc
diff --git a/Frame.qml b/Frame.qml
diff --git a/GroupBox.qml b/GroupBox.qml
diff --git a/ItemDelegate.qml b/ItemDelegate.qml
diff --git a/ItemDelegate.qmlc b/ItemDelegate.qmlc
diff --git a/LICENSE b/LICENSE
diff --git a/Label.qml b/Label.qml
diff --git a/Label.qmlc b/Label.qmlc
diff --git a/Menu.qml b/Menu.qml
diff --git a/Menu.qmlc b/Menu.qmlc
diff --git a/MenuItem.qml b/MenuItem.qml
diff --git a/MenuItem.qmlc b/MenuItem.qmlc
diff --git a/Page.qml b/Page.qml
diff --git a/Page.qmlc b/Page.qmlc
diff --git a/Popup.qml b/Popup.qml
diff --git a/Popup.qmlc b/Popup.qmlc
diff --git a/ProgressBar.qml b/ProgressBar.qml
diff --git a/README.md b/README.md
diff --git a/RadioButton.qml b/RadioButton.qml
diff --git a/RadioDelegate.qml b/RadioDelegate.qml
diff --git a/RadioIndicator.qml b/RadioIndicator.qml
diff --git a/RangeSlider.qml b/RangeSlider.qml
diff --git a/ScrollBar.qml b/ScrollBar.qml
diff --git a/ScrollBar.qmlc b/ScrollBar.qmlc
diff --git a/ScrollView.qml b/ScrollView.qml
diff --git a/ScrollView.qmlc b/ScrollView.qmlc
diff --git a/Slider.qml b/Slider.qml
diff --git a/Slider.qmlc b/Slider.qmlc
diff --git a/SpinBox.qml b/SpinBox.qml
diff --git a/SpinBox.qmlc b/SpinBox.qmlc
diff --git a/SwipeView.qml b/SwipeView.qml
diff --git a/SwipeView.qmlc b/SwipeView.qmlc
diff --git a/Switch.qml b/Switch.qml
diff --git a/SwitchDelegate.qml b/SwitchDelegate.qml
diff --git a/SwitchIndicator.qml b/SwitchIndicator.qml
diff --git a/TabBar.qml b/TabBar.qml
diff --git a/TabButton.qml b/TabButton.qml
diff --git a/TextArea.qml b/TextArea.qml
diff --git a/TextArea.qmlc b/TextArea.qmlc
diff --git a/TextField.qml b/TextField.qml
diff --git a/TextField.qmlc b/TextField.qmlc
diff --git a/ToolBar.qml b/ToolBar.qml
@@ -31,30 +31,33 @@ T.ToolBar {
     implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(background ? background.implicitHeight : 0, contentHeight + topPadding + bottomPadding)
 
+    leftPadding: 11
+    rightPadding: 11
+
     contentWidth: contentChildren[0].implicitWidth
     contentHeight: contentChildren[0].implicitHeight
 
     contentItem: Item {}
 
-    readonly property bool mainToolbar : controlRoot == T.ApplicationWindow.header
+    readonly property bool mainHeader : controlRoot == T.ApplicationWindow.header
     readonly property bool mainFooter : controlRoot == T.ApplicationWindow.footer
     readonly property bool isFooter : controlRoot.position == T.ToolBar.Footer
+    readonly property bool isHeader : controlRoot.position == T.ToolBar.Header
 
     background: Rectangle 
     {
-        implicitHeight: 48
-
+        implicitHeight: 48        
 
-        color: mainToolbar || isFooter ? Kirigami.Theme.buttonBackgroundColor:  Kirigami.Theme.viewBackgroundColor
+        color: mainHeader || mainFooter ? Kirigami.Theme.buttonBackgroundColor :  ( isHeader || isFooter) ? Kirigami.Theme.viewBackgroundColor : Kirigami.Theme.viewBackgroundColor
 
         Kirigami.Separator 
         {
-            visible: mainToolbar
+            visible: mainHeader
             anchors 
             {
                 left: parent.left
                 right: parent.right
-                top: mainToolbar ? parent.top : undefined
+                top: mainHeader ? parent.top : undefined
             }
         }  
 

diff --git a/ToolBar.qmlc b/ToolBar.qmlc
diff --git a/ToolButton.qmlc b/ToolButton.qmlc
diff --git a/ToolTip.qml b/ToolTip.qml
diff --git a/ToolTip.qmlc b/ToolTip.qmlc
diff --git a/private/DefaultListItemBackground.qml b/private/DefaultListItemBackground.qml
diff --git a/private/DefaultListItemBackground.qmlc b/private/DefaultListItemBackground.qmlc