From 4c659fa519dc1ac1d8e073f25b32a9863fd36b4c Mon Sep 17 00:00:00 2001 From: Camila Ayres Date: Fri, 13 Sep 2024 10:30:30 +0200 Subject: [PATCH] Adjust radius values: main window and text input uses bigger value, dropdown menus uses half. Signed-off-by: Camila Ayres --- src/gui/tray/TrayFolderListItem.qml | 2 +- src/gui/tray/UserLine.qml | 10 +++++----- src/gui/tray/Window.qml | 14 +++++++------- theme/Style/Style.qml | 3 +++ 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/gui/tray/TrayFolderListItem.qml b/src/gui/tray/TrayFolderListItem.qml index c86fe2f50..13cc5fa0e 100644 --- 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 396acfc47..d09216eff 100644 --- a/src/gui/tray/UserLine.qml +++ b/src/gui/tray/UserLine.qml @@ -40,7 +40,7 @@ AbstractButton { color: (userLine.hovered || userLine.visualFocus) && !(userMoreButton.hovered || userMoreButton.visualFocus) ? palette.highlight : palette.window - radius: Style.trayWindowRadius + radius: Style.halfWindowRadius } contentItem: RowLayout { @@ -160,7 +160,7 @@ AbstractButton { background: Rectangle { border.color: palette.dark - radius: Style.trayWindowRadius + radius: Style.halfTrayWindowRadius color: palette.window } @@ -173,7 +173,7 @@ AbstractButton { onClicked: showUserStatusSelector(index) background: Rectangle { - radius: Style.trayWindowRadius + radius: Style.halfTrayWindowRadius color: parent.hovered ? palette.highlight : palette.window } } @@ -200,7 +200,7 @@ AbstractButton { } background: Rectangle { - radius: Style.trayWindowRadius + radius: Style.halfTrayWindowRadius color: parent.hovered ? palette.highlight : palette.window } } @@ -220,7 +220,7 @@ AbstractButton { Accessible.onPressAction: removeAccountButton.clicked() background: Rectangle { - radius: Style.trayWindowRadius + radius: Style.halfTrayWindowRadius color: parent.hovered ? palette.highlight : palette.window } } diff --git a/src/gui/tray/Window.qml b/src/gui/tray/Window.qml index b29d30959..7af5d5cdf 100644 --- a/src/gui/tray/Window.qml +++ b/src/gui/tray/Window.qml @@ -289,7 +289,7 @@ ApplicationWindow { background: Rectangle { border.color: palette.dark color: palette.window - radius: Style.trayWindowRadius + radius: Style.halfTrayWindowRadius } onClosed: { @@ -349,7 +349,7 @@ ApplicationWindow { Accessible.onPressAction: addAccountButton.clicked() background: Rectangle { - radius: Style.trayWindowRadius + radius: Style.halfTrayWindowRadius color: palette.highlight visible: addAccountButton.hovered } @@ -372,7 +372,7 @@ ApplicationWindow { Accessible.onPressAction: syncPauseButton.clicked() background: Rectangle { - radius: Style.trayWindowRadius + radius: Style.halfTrayWindowRadius color: palette.highlight visible: syncPauseButton.hovered } @@ -389,7 +389,7 @@ ApplicationWindow { Accessible.onPressAction: settingsButton.clicked() background: Rectangle { - radius: Style.trayWindowRadius + radius: Style.halfTrayWindowRadius color: palette.highlight visible: settingsButton.hovered } @@ -406,7 +406,7 @@ ApplicationWindow { Accessible.onPressAction: exitButton.clicked() background: Rectangle { - radius: Style.trayWindowRadius + radius: Style.halfTrayWindowRadius color: palette.highlight visible: exitButton.hovered } @@ -611,7 +611,7 @@ ApplicationWindow { background: Rectangle { border.color: palette.dark - radius: Style.trayWindowRadius + radius: Style.halfTrayWindowRadius color: palette.window } @@ -647,7 +647,7 @@ ApplicationWindow { anchors.fill: parent anchors.margins: 1 color: appEntry.hovered ? palette.highlight : palette.window - radius: Style.trayWindowRadius + radius: Style.halfTrayWindowRadius } } } diff --git a/theme/Style/Style.qml b/theme/Style/Style.qml index 03eec1c8c..f48f885e9 100644 --- a/theme/Style/Style.qml +++ b/theme/Style/Style.qml @@ -50,7 +50,10 @@ QtObject { // Dimensions and sizes property int trayWindowWidth: variableSize(400) property int trayWindowHeight: variableSize(510) + // text input and main windows radius property int trayWindowRadius: 10 + // dropdown menus radius + property int halfTrayWindowRadius: 5 property int trayWindowBorderWidth: variableSize(1) property int trayWindowHeaderHeight: variableSize(60) property int trayHorizontalMargin: 10