diff --git a/Gui/TopBar.qml b/Gui/TopBar.qml index af96145..d118d22 100644 --- a/Gui/TopBar.qml +++ b/Gui/TopBar.qml @@ -41,6 +41,7 @@ ColumnLayout onClicked: { appLoader.source = "Dashboard.qml" + // dashiBackie.border.width = 2 // kundiBackie.border.width = 1 // mitoBackie.border.width = 1 diff --git a/TeroStyle/ComboBox.qml b/TeroStyle/ComboBox.qml index a3b6629..dcbe890 100644 --- a/TeroStyle/ComboBox.qml +++ b/TeroStyle/ComboBox.qml @@ -9,20 +9,15 @@ T.ComboBox { font: Typography.body implicitHeight: implicitContentHeight + topInset + bottomInset - background: Rectangle { - border.color: Colors.interactive - border.width: 1 - color: Colors.mantle - height: parent.height - radius: Dimensions.radius - width: parent.width - } + contentItem: T.TextField { + id: test autoScroll: control.editable color: Colors.foreground enabled: control.editable + font: Typography.body - implicitHeight: Typography.body.pointSize + topPadding + bottomPadding + implicitHeight: Typography.body.pixelSize + topPadding + bottomPadding + 2 inputMethodHints: control.inputMethodHints padding: Dimensions.m readOnly: control.down @@ -30,6 +25,15 @@ T.ComboBox { text: control.editable ? control.editText : control.displayText validator: control.validator width: control.width - indicator.width + verticalAlignment: TextInput.AlignVCenter + } + background: Rectangle { + border.color: Colors.interactive + border.width: 1 + color: Colors.mantle + // height: parent.height + radius: Dimensions.radius + width: parent.width } delegate: MenuItem { id: menuItem @@ -107,4 +111,11 @@ T.ComboBox { } } } + Component.onCompleted: + { + console.log(test.height) + console.log(control.height) + console.log(test.font.pointSize) + console.log(test.font.pixelSize) + } } diff --git a/TeroStyle/TextField.qml b/TeroStyle/TextField.qml index 2c1bde4..fbff88b 100644 --- a/TeroStyle/TextField.qml +++ b/TeroStyle/TextField.qml @@ -11,13 +11,15 @@ T.TextField radius: Dimensions.radius border.width: !control.focus ? 1 : 2 border.color: Colors.interactive - height: 47 + height: control.implicitHeight } color: Colors.foreground - implicitHeight: background.height + implicitHeight: Typography.body.pixelSize + topPadding + bottomPadding placeholderTextColor: Colors.interactive font: Typography.body - padding: Dimensions.s + padding: Dimensions.m + verticalAlignment: Text.AlignVCenter + }