Adjust radius values: main window and text input uses bigger value, dropdown menus...

Signed-off-by: Camila Ayres <hello@camilasan.com>

diff --git a/src/gui/tray/TrayFolderListItem.qml b/src/gui/tray/TrayFolderListItem.qml
index c86fe2f501dbe4a478ad90cc714b66a03ef36ea0..13cc5fa0ec05f68d9c5be514749a918dd839d7d0 100644 (file)
--- a/src/gui/tray/TrayFolderListItem.qml
+++ b/src/gui/tray/TrayFolderListItem.qml
@@ -37,7 +37,7 @@ MenuItem {
             anchors.fill: parent
             anchors.margins: Style.normalBorderWidth
             color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
-            radius: Style.trayWindowRadius
+            radius: Style.halfTrayWindowRadius
         }
     }
 

diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
index 396acfc472e3a7c21ff5f462e592f32696402c0c..d09216eff06f8e493224e67223085cf2762ff7dc 100644 (file)
--- a/src/gui/tray/UserLine.qml
+++ b/src/gui/tray/UserLine.qml
@@ -40,7 +40,7 @@ AbstractButton {
         color: (userLine.hovered || userLine.visualFocus) &&\r
                !(userMoreButton.hovered || userMoreButton.visualFocus) ?\r
                    palette.highlight : palette.window\r
-        radius: Style.trayWindowRadius\r
+        radius: Style.halfWindowRadius\r
     }\r
 \r
     contentItem: RowLayout {\r
@@ -160,7 +160,7 @@ AbstractButton {
 \r
                 background: Rectangle {\r
                     border.color: palette.dark\r
-                    radius: Style.trayWindowRadius\r
+                    radius: Style.halfTrayWindowRadius\r
                     color: palette.window\r
                 }\r
 \r
@@ -173,7 +173,7 @@ AbstractButton {
                     onClicked: showUserStatusSelector(index)\r
 \r
                     background: Rectangle {\r
-                        radius: Style.trayWindowRadius\r
+                        radius: Style.halfTrayWindowRadius\r
                         color: parent.hovered ? palette.highlight : palette.window\r
                     }\r
                 }\r
@@ -200,7 +200,7 @@ AbstractButton {
                     }\r
 \r
                     background: Rectangle {\r
-                        radius: Style.trayWindowRadius\r
+                        radius: Style.halfTrayWindowRadius\r
                         color: parent.hovered ? palette.highlight : palette.window\r
                     }\r
                 }\r
@@ -220,7 +220,7 @@ AbstractButton {
                     Accessible.onPressAction: removeAccountButton.clicked()\r
 \r
                     background: Rectangle {\r
-                        radius: Style.trayWindowRadius\r
+                        radius: Style.halfTrayWindowRadius\r
                         color: parent.hovered ? palette.highlight : palette.window\r
                     }\r
                 }\r

diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml
index b29d30959d8da940d7b2b8f966506bb1cf4e1e30..7af5d5cdf1333dc384cd9faf89ad38d78f0ab41d 100644 (file)
--- a/src/gui/tray/Window.qml
+++ b/src/gui/tray/Window.qml
@@ -289,7 +289,7 @@ ApplicationWindow {
                         background: Rectangle {\r
                             border.color: palette.dark\r
                             color: palette.window\r
-                            radius: Style.trayWindowRadius\r
+                            radius: Style.halfTrayWindowRadius\r
                         }\r
 \r
                         onClosed: {\r
@@ -349,7 +349,7 @@ ApplicationWindow {
                             Accessible.onPressAction: addAccountButton.clicked()\r
 \r
                             background: Rectangle {\r
-                                radius: Style.trayWindowRadius\r
+                                radius: Style.halfTrayWindowRadius\r
                                 color: palette.highlight\r
                                 visible: addAccountButton.hovered\r
                             }\r
@@ -372,7 +372,7 @@ ApplicationWindow {
                             Accessible.onPressAction: syncPauseButton.clicked()\r
 \r
                             background: Rectangle {\r
-                                radius: Style.trayWindowRadius\r
+                                radius: Style.halfTrayWindowRadius\r
                                 color: palette.highlight\r
                                 visible: syncPauseButton.hovered\r
                             }\r
@@ -389,7 +389,7 @@ ApplicationWindow {
                             Accessible.onPressAction: settingsButton.clicked()\r
 \r
                             background: Rectangle {\r
-                                radius: Style.trayWindowRadius\r
+                                radius: Style.halfTrayWindowRadius\r
                                 color: palette.highlight\r
                                 visible: settingsButton.hovered\r
                             }\r
@@ -406,7 +406,7 @@ ApplicationWindow {
                             Accessible.onPressAction: exitButton.clicked()\r
 \r
                             background: Rectangle {\r
-                                radius: Style.trayWindowRadius\r
+                                radius: Style.halfTrayWindowRadius\r
                                 color: palette.highlight\r
                                 visible: exitButton.hovered\r
                             }\r
@@ -611,7 +611,7 @@ ApplicationWindow {
 \r
                         background: Rectangle {\r
                             border.color: palette.dark\r
-                            radius: Style.trayWindowRadius\r
+                            radius: Style.halfTrayWindowRadius\r
                             color: palette.window\r
                         }\r
 \r
@@ -647,7 +647,7 @@ ApplicationWindow {
                                         anchors.fill: parent\r
                                         anchors.margins: 1\r
                                         color: appEntry.hovered ? palette.highlight : palette.window\r
-                                        radius: Style.trayWindowRadius\r
+                                        radius: Style.halfTrayWindowRadius\r
                                     }\r
                                 }\r
                             }\r

diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml
index 03eec1c8c1b0b863fac4337bfbc8078366a6902e..f48f885e97c7df021acfcd2ef86ed5057bda3ddb 100644 (file)
--- a/theme/Style/Style.qml
+++ b/theme/Style/Style.qml
@@ -50,7 +50,10 @@ QtObject {
     // Dimensions and sizes\r
     property int trayWindowWidth: variableSize(400)\r
     property int trayWindowHeight: variableSize(510)\r
+    // text input and main windows radius\r
     property int trayWindowRadius: 10\r
+    // dropdown menus radius\r
+    property int halfTrayWindowRadius: 5\r
     property int trayWindowBorderWidth: variableSize(1)\r
     property int trayWindowHeaderHeight: variableSize(60)\r
     property int trayHorizontalMargin: 10\r