AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into feature/new-gui

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-06-16 13:49:19 +09:00
commit 4224e8314b
10 changed files with 54 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/ui/qml/Controls2/BasicButtonType.qml
View file

@ -24,10 +24,10 @@ Button {
radius: 16
color: {
if (root.enabled) {
if(root.pressed) {
if (root.pressed) {
return pressedColor
}
return hovered ? hoveredColor : defaultColor
return root.hovered ? hoveredColor : defaultColor
} else {
return disabledColor
}

12
client/ui/qml/Controls2/PopupType.qml
View file

@ -27,15 +27,17 @@ Popup {
background: Rectangle {
anchors.fill: parent
color: Qt.rgba(215/255, 216/255, 219/255, 0.95)
color: "white"//Qt.rgba(215/255, 216/255, 219/255, 0.95)
radius: 4
}
contentItem: RowLayout {
width: parent.width
anchors.fill: parent
anchors.leftMargin: 16
anchors.rightMargin: 16
CaptionTextType {
horizontalAlignment: Text.AlignHCenter
horizontalAlignment: Text.AlignLeft
Layout.fillWidth: true
text: root.popupErrorMessageText
@ -44,7 +46,7 @@ Popup {
BasicButtonType {
visible: closeButtonVisible
defaultColor: Qt.rgba(215/255, 216/255, 219/255, 0.95)
defaultColor: "white"//"transparent"//Qt.rgba(215/255, 216/255, 219/255, 0.95)
hoveredColor: "#C1C2C5"
pressedColor: "#AEB0B7"
disabledColor: "#494B50"
@ -52,7 +54,7 @@ Popup {
textColor: "#0E0E11"
borderWidth: 0
text: "Close"
text: qsTr("Close")
onClicked: {
root.close()
}