From 964436ad437cda1fa477ffa914a097e3586597ea Mon Sep 17 00:00:00 2001 From: MrMirDan <58086007+MrMirDan@users.noreply.github.com> Date: Thu, 5 Feb 2026 06:56:41 +0200 Subject: [PATCH] fix: placeholder color, hide button image transparency, removed some lines (#2123) * fix: placeholder color, hide button image transparency, removed unneccessary lines * update: removed opacity on tunneling page * update: remove opacity on app tunneling page --- client/ui/qml/Controls2/BasicButtonType.qml | 6 +++--- .../qml/Controls2/TextFieldWithHeaderType.qml | 17 +++-------------- .../Pages2/PageSettingsAppSplitTunneling.qml | 1 - .../qml/Pages2/PageSettingsSplitTunneling.qml | 1 - 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/client/ui/qml/Controls2/BasicButtonType.qml b/client/ui/qml/Controls2/BasicButtonType.qml index 914fc267..769c3e04 100644 --- a/client/ui/qml/Controls2/BasicButtonType.qml +++ b/client/ui/qml/Controls2/BasicButtonType.qml @@ -111,11 +111,11 @@ Button { color: { if (root.enabled) { if (root.pressed) { - return pressedColor + return root.pressedColor } - return root.hovered ? hoveredColor : defaultColor + return root.hovered ? root.hoveredColor : root.defaultColor } else { - return disabledColor + return root.disabledColor } } diff --git a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml index b7de64c6..89758430 100644 --- a/client/ui/qml/Controls2/TextFieldWithHeaderType.qml +++ b/client/ui/qml/Controls2/TextFieldWithHeaderType.qml @@ -19,9 +19,6 @@ Item { property string buttonText property string buttonImageSource - property string buttonImageColor: AmneziaStyle.color.midnightBlack - property string buttonBackgroundColor: AmneziaStyle.color.paleGray - property string buttonHoveredColor: AmneziaStyle.color.lightGray property var clickedFunc property alias textField: textField @@ -70,7 +67,7 @@ Item { border.width: 1 Behavior on border.color { - PropertyAnimation { duration: 100 } + PropertyAnimation { duration: 200 } } RowLayout { @@ -124,7 +121,7 @@ Item { background: Rectangle { anchors.fill: parent - color: root.enabled ? root.backgroundColor : root.backgroundDisabledColor + color: root.backgroundDisabledColor } onTextChanged: { @@ -189,14 +186,6 @@ Item { focusPolicy: Qt.NoFocus text: root.buttonText leftImageSource: root.buttonImageSource - leftImageColor: root.buttonImageColor - - defaultColor: root.buttonBackgroundColor - hoveredColor: root.buttonHoveredColor - pressedColor: root.buttonHoveredColor - disabledColor: AmneziaStyle.color.transparent - - borderWidth: 0 anchors.top: content.top anchors.bottom: content.bottom @@ -204,7 +193,7 @@ Item { height: content.implicitHeight width: content.implicitHeight - squareLeftSide: false + squareLeftSide: true clickedFunc: function() { if (root.clickedFunc && typeof root.clickedFunc === "function") { diff --git a/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml index 4445b08b..f3c63eb5 100644 --- a/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml +++ b/client/ui/qml/Pages2/PageSettingsAppSplitTunneling.qml @@ -224,7 +224,6 @@ PageType { height: addAppButton.implicitHeight + 48 + SettingsController.safeAreaBottomMargin color: AmneziaStyle.color.midnightBlack - opacity: 0.8 RowLayout { id: addAppButton diff --git a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml index 27aa5dea..ed092336 100644 --- a/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml +++ b/client/ui/qml/Pages2/PageSettingsSplitTunneling.qml @@ -240,7 +240,6 @@ PageType { height: addSiteButton.implicitHeight + 48 color: AmneziaStyle.color.midnightBlack - opacity: 0.8 RowLayout { id: addSiteButton