diff --git a/Gui/AddNewObject.qml b/Gui/AddNewObject.qml index 7ad3205..5e2ab19 100644 --- a/Gui/AddNewObject.qml +++ b/Gui/AddNewObject.qml @@ -67,7 +67,6 @@ GridLayout model: address_model textRole: "display" popup.height: 300 - popup.y: postcode.y + 5 - (postcode.height * 2) currentIndex: -1 onCurrentIndexChanged: city.currentIndex = postcode.currentIndex @@ -95,7 +94,6 @@ GridLayout model: address_model textRole: "city" popup.height: 300 - popup.y: postcode.y + 5 - (postcode.height * 2) currentIndex: -1 } diff --git a/Gui/ApplicantPersonalData.qml b/Gui/ApplicantPersonalData.qml index 6a944a3..19e34c6 100644 --- a/Gui/ApplicantPersonalData.qml +++ b/Gui/ApplicantPersonalData.qml @@ -118,7 +118,6 @@ GridLayout model: address_model textRole: "display" popup.height: 300 - popup.y: postcode.y + 5 - (postcode.height * 2) currentIndex: -1 onCurrentIndexChanged: city.currentIndex = postcode.currentIndex validator: RegularExpressionValidator @@ -145,7 +144,6 @@ GridLayout model: address_model textRole: "city" popup.height: 300 - popup.y: postcode.y + 5 - (postcode.height * 2) currentIndex: -1 } diff --git a/Gui/CompanyConf.qml b/Gui/CompanyConf.qml index d76f9af..05e0dbc 100644 --- a/Gui/CompanyConf.qml +++ b/Gui/CompanyConf.qml @@ -76,8 +76,6 @@ ColumnLayout model: address_model textRole: "display" popup.height: 300 - popup.y: zipcode.y + 5 - (zipcode.height * 2) - //currentIndex: -1 onCurrentIndexChanged: city.currentIndex = zipcode.currentIndex validator: RegularExpressionValidator { @@ -100,7 +98,6 @@ ColumnLayout model: address_model textRole: "city" popup.height: 300 - popup.y: zipcode.y + 5 - (zipcode.height * 2) currentIndex: -1 } } diff --git a/Gui/CustomerView.qml b/Gui/CustomerView.qml index bb861d1..2b5f8a3 100644 --- a/Gui/CustomerView.qml +++ b/Gui/CustomerView.qml @@ -96,7 +96,6 @@ GridLayout model: address_model textRole: "display" popup.height: 300 - popup.y: postcode.y + 5 - (postcode.height * 2) currentIndex: -1 onCurrentIndexChanged: city.currentIndex = postcode.currentIndex Layout.columnSpan: 3 @@ -123,10 +122,8 @@ GridLayout model: address_model textRole: "city" popup.height: 300 - popup.y: postcode.y + 5 - (postcode.height * 2) currentIndex: -1 Layout.columnSpan: 3 - // onCurrentIndexChanged: postcode.currentIndex = city.currentIndex } Label diff --git a/Gui/ObjectView.qml b/Gui/ObjectView.qml index 897ac12..782d089 100644 --- a/Gui/ObjectView.qml +++ b/Gui/ObjectView.qml @@ -90,7 +90,6 @@ GridLayout model: address_model textRole: "city" popup.height: 300 - popup.y: postcode.y + 5 - (postcode.height * 2) currentIndex: -1 } diff --git a/TeroStyle/ComboBox.qml b/TeroStyle/ComboBox.qml index dd64735..09f34b4 100644 --- a/TeroStyle/ComboBox.qml +++ b/TeroStyle/ComboBox.qml @@ -76,7 +76,7 @@ T.ComboBox { onPressed: () => { control.popup.visible = true; - control.popup.focus = true + control.popup.forceActiveFocus() } } } @@ -86,6 +86,7 @@ T.ComboBox { padding: 1 topMargin: 6 width: control.width + y: control.height background: Rectangle { border.color: Colors.interactive