From 2d8c2579aa0e9ae2a613f69ba893e30ae5ff4407 Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Tue, 5 Apr 2016 22:17:22 -0400
Subject: [PATCH] Using proper logo colors.

---
 src/ui/toolbar/MainToolBar.qml | 48 ++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml
index 4dd075014..680bcaef8 100644
--- a/src/ui/toolbar/MainToolBar.qml
+++ b/src/ui/toolbar/MainToolBar.qml
@@ -403,6 +403,31 @@ Rectangle {
         anchors.bottom: parent.bottom
         height:         1
         color:          "black"
+        visible:        qgcPal.globalTheme == QGCPalette.Light
+    }
+
+    //---------------------------------------------
+    // Logo (Preferences Button)
+    Rectangle {
+        id:                     preferencesButton
+        width:                  mainWindow.tbButtonWidth * 1.25
+        height:                 parent.height
+        anchors.top:            parent.top
+        anchors.left:           parent.left
+        color:                  "#4A2C6D"
+        Image {
+            height:                 mainWindow.tbCellHeight
+            anchors.centerIn:       parent
+            source:                 "/res/QGCLogoWhite"
+            fillMode:               Image.PreserveAspectFit
+            smooth:                 true
+            mipmap:                 true
+            antialiasing:           true
+        }
+        MouseArea {
+            anchors.fill: parent
+            onClicked: mainWindow.showLeftMenu()
+        }
     }
 
     //---------------------------------------------
@@ -411,7 +436,7 @@ Rectangle {
         id:                     viewRow
         height:                 mainWindow.tbCellHeight
         spacing:                mainWindow.tbSpacing
-        anchors.left:           parent.left
+        anchors.left:           preferencesButton.right
         anchors.leftMargin:     mainWindow.tbSpacing
         anchors.bottomMargin:   1
         anchors.top:            parent.top
@@ -419,27 +444,6 @@ Rectangle {
 
         ExclusiveGroup { id: mainActionGroup }
 
-        Image {
-            id:                     preferencesButton
-            width:                  mainWindow.tbButtonWidth
-            anchors.topMargin:      _topBottomMargins
-            anchors.bottomMargin:   _topBottomMargins
-            anchors.top:            parent.top
-            anchors.bottom:         parent.bottom
-            source:                 qgcPal.globalTheme == QGCPalette.Light ? "/res/QGCLogoBlack" : "/res/QGCLogoWhite"
-            fillMode:               Image.PreserveAspectFit
-            smooth:                 true
-            mipmap:                 true
-            antialiasing:           true
-
-            readonly property real _topBottomMargins: ScreenTools.defaultFontPixelHeight / 2
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: mainWindow.showLeftMenu()
-            }
-        }
-
         QGCToolBarButton {
             id:                 setupButton
             width:              mainWindow.tbButtonWidth
-- 
2.22.0