work on the different toolbars types: headertoolbar, secondarytoolbar…

… and footertoolbar #3
mauikit · Mar 25, 2018 · befd1db · befd1db
1 parent 4d1c226
commit befd1db
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 14 deletions.
diff --git a/ToolBar.qml b/ToolBar.qml
@@ -38,14 +38,14 @@ T.ToolBar {
 
     readonly property bool mainToolbar : controlRoot == T.ApplicationWindow.header
     readonly property bool mainFooter : controlRoot == T.ApplicationWindow.footer
-    readonly property bool isFooter : position == ToolBar.Footer
+    readonly property bool isFooter : controlRoot.position == T.ToolBar.Footer
 
     background: Rectangle 
     {
         implicitHeight: 48
 
 
-        color: mainToolbar ? Kirigami.Theme.buttonBackgroundColor:  Kirigami.Theme.viewBackgroundColor
+        color: mainToolbar || isFooter ? Kirigami.Theme.buttonBackgroundColor:  Kirigami.Theme.viewBackgroundColor
 
         Kirigami.Separator 
         {
@@ -64,7 +64,7 @@ T.ToolBar {
             {
                 left: parent.left
                 right: parent.right
-                bottom: parent.bottom 
+                bottom: isFooter? undefined : parent.bottom 
             }
         }
 

diff --git a/ToolBar.qml~ b/ToolBar.qml~
@@ -38,14 +38,14 @@ T.ToolBar {
 
     readonly property bool mainToolbar : controlRoot == T.ApplicationWindow.header
     readonly property bool mainFooter : controlRoot == T.ApplicationWindow.footer
-    readonly property bool isFooter : position == ToolBar.Footer
+    readonly property bool isFooter : controlRoot.position == T.ToolBar.Footer
 
     background: Rectangle 
     {
         implicitHeight: 48
 
 
-        color: mainToolbar ? Kirigami.Theme.backgroundColor:  Kirigami.Theme.viewBackgroundColor
+        color: mainToolbar || isFooter ? Kirigami.Theme.buttonBackgroundColor:  Kirigami.Theme.viewBackgroundColor
 
         Kirigami.Separator 
         {
@@ -58,15 +58,7 @@ T.ToolBar {
             }
         }  
 
-         Kirigami.Separator 
-        {
-            anchors 
-            {
-                left: parent.left
-                right: parent.right
-                bottom: parent.bottom 
-            }
-        }
+
 
     }
 }
diff --git a/private/DefaultListItemBackground.qmlc b/private/DefaultListItemBackground.qmlc