status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(BeforeGetStartedModal): fix padding and (line) spacings 

additionally correct the way a font is propagated from a QQC2 Control
down to our components

Fixes #6515
This commit is contained in:
Lukáš Tinkl 2022-10-28 12:55:22 +02:00 committed by Lukáš Tinkl
parent b9a9f2a20f
commit 9327b483a4
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/StatusQ/src/StatusQ/Controls/StatusCheckBox.qml
View File

@ -1,17 +1,16 @@
import QtQuick 2.14
import QtQuick.Controls 2.14
import QtGraphicalEffects 1.14
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Components 0.1
CheckBox {
id: root
property bool leftSide: true
font.family: Theme.palette.baseFont.name
indicator: Rectangle {
anchors.left: root.leftSide? parent.left : undefined
anchors.right: !root.leftSide? parent.right : undefined
@ -36,12 +35,13 @@ CheckBox {
contentItem: StatusBaseText {
text: root.text
font.pixelSize: root.font.pixelSize
font: root.font
opacity: enabled ? 1.0 : 0.3
verticalAlignment: Text.AlignVCenter
wrapMode: Text.WordWrap
width: parent.width
color: Theme.palette.directColor1
lineHeight: 1.2
leftPadding: root.leftSide? (!!root.text ? root.indicator.width + root.spacing
: root.indicator.width) : 0
rightPadding: !root.leftSide? (!!root.text ? root.indicator.width + root.spacing

3
ui/StatusQ/src/StatusQ/Controls/StatusRadioButton.qml
View File

@ -3,7 +3,6 @@ import QtQuick.Controls 2.14
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Components 0.1
RadioButton {
id: root
@ -22,6 +21,8 @@ RadioButton {
Large
}
font.family: Theme.palette.baseFont.name
indicator: Rectangle {
implicitWidth: root.size === StatusRadioButton.Size.Large ? 20 : 14
implicitHeight: root.size === StatusRadioButton.Size.Large ? 20 : 14

6
ui/app/AppLayouts/Onboarding/popups/BeforeGetStartedModal.qml
View File

@ -14,6 +14,8 @@ StatusDialog {
id: root
width: 480
topPadding: Style.current.bigPadding
bottomPadding: Style.current.bigPadding
closePolicy: Popup.NoAutoClose
header: StatusDialogHeader {
@ -37,13 +39,13 @@ StatusDialog {
contentItem: Item {
Column {
width: 416
spacing: 16
spacing: Style.current.padding
anchors.centerIn: parent
StatusCheckBox {
id: acknowledge
objectName: "acknowledgeCheckBox"
spacing: 8
spacing: Style.current.halfPadding
font.pixelSize: 15
width: parent.width
text: qsTr("I acknowledge that Status Desktop is in Beta and by using it I take the full responsibility for all risks concerning my data and funds.")