Fixes for custom task bar

nextmcloud · Dec 1, 2023 · c8d51f1 · c8d51f1
1 parent 2f036c1
commit c8d51f1
Show file tree

Hide file tree

Showing 4 changed files with 215 additions and 234 deletions.
diff --git a/src/gui/nmcgui/NMCHeaderButton.qml b/src/gui/nmcgui/NMCHeaderButton.qml
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 by Nicolas Fella <[email protected]>
+ * Copyright (C) 2020 by Eugen Fischer
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,12 +33,7 @@ Button {
 
     icon.width: Style.headerButtonIconSize
     icon.height: Style.headerButtonIconSize
-    icon.color: palette.brightText
-    font.pixelSize: 8
-
-    Layout.alignment: Qt.AlignRight
-    Layout.preferredWidth:  Style.trayWindowHeaderHeight
-    Layout.preferredHeight: Style.trayWindowHeaderHeight
+    icon.color: Style.nmcBrowserButtonColor
 
     background: Rectangle {
         color: root.hovered || root.visualFocus ? Style.currentUserHeaderTextColor : "transparent"

diff --git a/src/gui/nmcgui/NMCLogoArea.qml b/src/gui/nmcgui/NMCLogoArea.qml
@@ -15,52 +15,24 @@
 import QtQml 2.15
 import QtQuick 2.15
 import QtQuick.Controls 2.15
+import QtQuick.Layouts 1.15
 
 import Style 1.0
 
 Rectangle{
     id: trayWindowMagentaBarBackground
     anchors.left:   trayWindowMainItem.left
     anchors.right:  trayWindowMainItem.right
-    height:         40//Style.trayWindowHeaderHeight
+    height:         Style.nmcTrayWindowHeaderHeight
     color:          Style.ncBlue
-    Rectangle {
-        id: trayWindowTLogoBarBackground
-        objectName: "trayWindowTLogoBarBackground"
 
-        anchors.left:   trayWindowMagentaBarBackground.left
-        anchors.right:  trayWindowMagentaBarBackground.right
-        anchors.top:    trayWindowMagentaBarBackground.top
-        height:         48
-        color:          Style.ncBlue
+    RowLayout
+    {
+        anchors.fill: trayWindowMagentaBarBackground
 
-        Rectangle {
-            id: trayWindowTLogoBarTopSpacer
-            objectName: "trayWindowTLogoBarTopSpacer"
-
-            anchors.left:   trayWindowTLogoBarBackground.left
-            anchors.right:  trayWindowTLogoBarBackground.right
-            anchors.top:    trayWindowTLogoBarBackground.top
-            height:         12
-            color:          Style.ncBlue
-        }
-        Rectangle {
-            id: trayWindowTLogoBarLeftSpacer
-            objectName: "trayWindowTLogoBarLeftSpacer"
-
-            anchors.left:   trayWindowTLogoBarBackground.left
-            anchors.top:    trayWindowTLogoBarTopSpacer.bottom
-            height:         38
-            width:          24
-            color:          Style.ncBlue
-        }
         Image {
-            id: magentaTLogo
-            objectName: "magentaTLogo"
-
-            anchors.left:   trayWindowTLogoBarLeftSpacer.right
-            anchors.top:    trayWindowTLogoBarTopSpacer.bottom
-            cache: false
+            anchors.verticalCenter: parent.verticalCenter
+            Layout.leftMargin: Style.nmcTrayWindowHeaderLeftMargin
             source: Style.nmcLogoMagenta
         }
     }