]> dgit.raspbian.org Git - nextcloud-desktop.git/commitdiff
Preps for UserLine submenu
authorDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Sun, 5 Jan 2020 20:31:09 +0000 (21:31 +0100)
committerDominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Sun, 5 Jan 2020 20:31:09 +0000 (21:31 +0100)
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
src/gui/tray/UserLine.qml
src/gui/tray/Window.qml
theme.qrc
theme/black/caret-down.svg [new file with mode: 0644]

index 0d4fb0f089065c63c174f1889d94d92830cd40b4..be8a63775f4e9998183e8ac84f5e9e0e30437149 100644 (file)
@@ -12,7 +12,7 @@ MenuItem {
     }\r
 \r
     id: userLine\r
-    width: 216\r
+    width: 220\r
     height: 60\r
 \r
     Rectangle {\r
@@ -79,13 +79,8 @@ MenuItem {
                             font.pixelSize: 10\r
                         }\r
                     }\r
-\r
-                    Item {\r
-                        id: userLineSpacer\r
-                        Layout.fillWidth: true\r
-                    }\r
                 }\r
-            }\r
+            } // accountButton\r
         }\r
     }   // Rectangle userLineBackground\r
 }   // MenuItem userLine\r
index d7bbe4a94665059f7dcdc0c7105c52a2566e75bc..2e918319dfc73300fd1e6f9c6e7f59b085208a98 100644 (file)
@@ -108,7 +108,7 @@ Window {
                             id: accountMenu\r
                             x: (currentAccountButton.x + 2)\r
                             y: (currentAccountButton.y + currentAccountButton.height + 2)\r
-                            width: (currentAccountButton.width - 4)\r
+                            width: (currentAccountButton.width)\r
                             closePolicy: "CloseOnPressOutside"\r
 \r
                             background: Rectangle {\r
index 8b593df98ebf7fb9a82f4aa95ebc8e6dd6e56a28..e24188f3090e0a70aa8abaf18cb4aef365f58884 100644 (file)
--- a/theme.qrc
+++ b/theme.qrc
         <file>theme/white/more-apps.svg</file>
         <file>theme/white/talk-app.svg</file>
         <file>theme/white/caret-down.svg</file>
+        <file>theme/black/caret-down.svg</file>
     </qresource>
 </RCC>
diff --git a/theme/black/caret-down.svg b/theme/black/caret-down.svg
new file mode 100644 (file)
index 0000000..bc3a4e0
--- /dev/null
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewbox="0 0 16 16"><path d="M4 6l4 4 4-3.994z" fill="#000"/></svg>