all changes not completed
This commit is contained in:
@@ -41,6 +41,7 @@ ColumnLayout
|
|||||||
onClicked:
|
onClicked:
|
||||||
{
|
{
|
||||||
appLoader.source = "Dashboard.qml"
|
appLoader.source = "Dashboard.qml"
|
||||||
|
|
||||||
// dashiBackie.border.width = 2
|
// dashiBackie.border.width = 2
|
||||||
// kundiBackie.border.width = 1
|
// kundiBackie.border.width = 1
|
||||||
// mitoBackie.border.width = 1
|
// mitoBackie.border.width = 1
|
||||||
|
|||||||
@@ -9,20 +9,15 @@ T.ComboBox {
|
|||||||
font: Typography.body
|
font: Typography.body
|
||||||
implicitHeight: implicitContentHeight + topInset + bottomInset
|
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 {
|
contentItem: T.TextField {
|
||||||
|
id: test
|
||||||
autoScroll: control.editable
|
autoScroll: control.editable
|
||||||
color: Colors.foreground
|
color: Colors.foreground
|
||||||
enabled: control.editable
|
enabled: control.editable
|
||||||
|
|
||||||
font: Typography.body
|
font: Typography.body
|
||||||
implicitHeight: Typography.body.pointSize + topPadding + bottomPadding
|
implicitHeight: Typography.body.pixelSize + topPadding + bottomPadding + 2
|
||||||
inputMethodHints: control.inputMethodHints
|
inputMethodHints: control.inputMethodHints
|
||||||
padding: Dimensions.m
|
padding: Dimensions.m
|
||||||
readOnly: control.down
|
readOnly: control.down
|
||||||
@@ -30,6 +25,15 @@ T.ComboBox {
|
|||||||
text: control.editable ? control.editText : control.displayText
|
text: control.editable ? control.editText : control.displayText
|
||||||
validator: control.validator
|
validator: control.validator
|
||||||
width: control.width - indicator.width
|
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 {
|
delegate: MenuItem {
|
||||||
id: 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)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,13 +11,15 @@ T.TextField
|
|||||||
radius: Dimensions.radius
|
radius: Dimensions.radius
|
||||||
border.width: !control.focus ? 1 : 2
|
border.width: !control.focus ? 1 : 2
|
||||||
border.color: Colors.interactive
|
border.color: Colors.interactive
|
||||||
height: 47
|
height: control.implicitHeight
|
||||||
}
|
}
|
||||||
|
|
||||||
color: Colors.foreground
|
color: Colors.foreground
|
||||||
implicitHeight: background.height
|
implicitHeight: Typography.body.pixelSize + topPadding + bottomPadding
|
||||||
placeholderTextColor: Colors.interactive
|
placeholderTextColor: Colors.interactive
|
||||||
font: Typography.body
|
font: Typography.body
|
||||||
padding: Dimensions.s
|
padding: Dimensions.m
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user