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

minor ui fixes

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-08-26 10:08:50 +03:00
parent a74736b100
commit 29bef052c7
16 changed files with 57 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ui/qml/Controls2/CheckBoxType.qml
View file

@ -21,7 +21,7 @@ CheckBox {
property string defaultBorderColor: "#D7D8DB"
property string checkedBorderColor: "#FBB26A"
property string checkedBorderDisabledColor: "#5A330C"
property string checkedBorderDisabledColor: "#402102"
property string checkedImageColor: "#FBB26A"
property string pressedImageColor: "#A85809"

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

@ -27,7 +27,9 @@ Item {
property string rootButtonDefaultBorderColor: "#2C2D30"
property string rootButtonPressedBorderColor: "#D7D8DB"
property int rootButtonTextMargins: 16
property int rootButtonTextLeftMargins: 16
property int rootButtonTextTopMargin: 16
property int rootButtonTextBottomMargin: 16
property real drawerHeight: 0.9
property Component listView
@ -76,9 +78,9 @@ Item {
spacing: 0
ColumnLayout {
Layout.leftMargin: rootButtonTextMargins
Layout.topMargin: rootButtonTextMargins
Layout.bottomMargin: rootButtonTextMargins
Layout.leftMargin: rootButtonTextLeftMargins
Layout.topMargin: rootButtonTextTopMargin
Layout.bottomMargin: rootButtonTextBottomMargin
LabelTextType {
Layout.fillWidth: true
@ -104,6 +106,8 @@ Item {
}
ImageButtonType {
Layout.rightMargin: 16
hoverEnabled: false
image: rootButtonImage
imageColor: rootButtonImageColor

11
client/ui/qml/Controls2/HorizontalRadioButton.qml
View file

@ -75,19 +75,20 @@ RadioButton {
ColumnLayout {
id: content
anchors.fill: parent
spacing: 16
spacing: 0
ButtonTextType {
text: root.text
color: root.enabled ? root.textColor : root.textDisabledColor
Layout.fillWidth: true
Layout.rightMargin: 16
Layout.leftMargin: 16
Layout.topMargin: 16
Layout.bottomMargin: 16
Layout.rightMargin: 24
Layout.leftMargin: 24
Layout.topMargin: 12
Layout.bottomMargin: 12
horizontalAlignment: Qt.AlignHCenter
verticalAlignment: Qt.AlignVCenter
}
}

2
client/ui/qml/Controls2/ProgressBarType.qml
View file

@ -8,7 +8,7 @@ ProgressBar {
implicitHeight: 4
background: Rectangle {
color: "#412102"
color: "#633303"
}
contentItem: Item {

9
client/ui/qml/Controls2/SwitcherType.qml
View file

@ -14,13 +14,13 @@ Switch {
property string textColor: "#D7D8DB"
property string textDisabledColor: "#878B91"
property string checkedIndicatorColor: "#412102"
property string checkedIndicatorColor: "#633303"
property string defaultIndicatorColor: "transparent"
property string checkedDisabledIndicatorColor: "#5A330C"
property string checkedDisabledIndicatorColor: "#402102"
property string checkedIndicatorBorderColor: "#412102"
property string checkedIndicatorBorderColor: "#633303"
property string defaultIndicatorBorderColor: "#494B50"
property string checkedDisabledIndicatorBorderColor: "#5A330C"
property string checkedDisabledIndicatorBorderColor: "#402102"
property string checkedInnerCircleColor: "#FBB26A"
property string defaultInnerCircleColor: "#D7D8DB"
@ -40,6 +40,7 @@ Switch {
anchors.left: content.right
anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 4
implicitWidth: 52
implicitHeight: 32

8
client/ui/qml/Controls2/TabButtonType.qml
View file

@ -4,7 +4,7 @@ import QtQuick.Controls
TabButton {
id: root
property string hoveredColor: "#412102"
property string hoveredColor: "#633303"
property string defaultColor: "#2C2D30"
property string selectedColor: "#FBB26A"
@ -39,6 +39,12 @@ TabButton {
}
}
MouseArea {
anchors.fill: background
cursorShape: Qt.PointingHandCursor
enabled: false
}
contentItem: Text {
anchors.fill: background
height: 24

9
client/ui/qml/Controls2/TabImageButtonType.qml
View file

@ -4,7 +4,7 @@ import QtQuick.Controls
TabButton {
id: root
property string hoveredColor: "#412102"
property string hoveredColor: "#633303"
property string defaultColor: "#D7D8DB"
property string selectedColor: "#FBB26A"
@ -18,7 +18,14 @@ TabButton {
icon.color: isSelected ? selectedColor : defaultColor
background: Rectangle {
id: background
anchors.fill: parent
color: "transparent"
}
MouseArea {
anchors.fill: background
cursorShape: Qt.PointingHandCursor
enabled: false
}
}

2
client/ui/qml/Controls2/TextAreaType.qml
View file

@ -29,7 +29,7 @@ Rectangle {
anchors.bottomMargin: 16
color: "#D7D8DB"
selectionColor: "#412102"
selectionColor: "#633303"
selectedTextColor: "#D7D8DB"
placeholderTextColor: "#878B91"

2
client/ui/qml/Controls2/TextFieldWithHeaderType.qml
View file

@ -74,7 +74,7 @@ Item {
placeholderText: root.textFieldPlaceholderText
placeholderTextColor: "#494B50"
selectionColor: "#412102"
selectionColor: "#633303"
selectedTextColor: "#D7D8DB"
font.pixelSize: 16