GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 20:26:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Align the dropdown panel in the combobox with the parent and get rid of

Browse Source 
binding loop messages.
This commit is contained in:
Diego Prado Gesto 2018-07-16 14:54:44 +02:00
parent 1d860c51c5
commit 6850ad4c9d
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/qml/Settings/SettingComboBox.qml
View File

@ -90,7 +90,7 @@ SettingItem
popup: Popup { popup: Popup {
y: control.height - UM.Theme.getSize("default_lining").height y: control.height - UM.Theme.getSize("default_lining").height
width: control.width width: control.width
implicitHeight: contentItem.implicitHeight implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width
padding: UM.Theme.getSize("default_lining").width padding: UM.Theme.getSize("default_lining").width
contentItem: ListView { contentItem: ListView {
@ -117,8 +117,9 @@ SettingItem
contentItem: Label contentItem: Label
{ {
// FIXME: Somehow the top/bottom anchoring is not correct on Linux and it results in invisible texts. // FIXME: Somehow the top/bottom anchoring is not correct on Linux and it results in invisible texts.
anchors.top: parent.top anchors.fill: parent
anchors.bottom: parent.bottom anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width
text: modelData.value text: modelData.value
renderType: Text.NativeRendering renderType: Text.NativeRendering

6
resources/qml/Settings/SettingExtruder.qml
View File

@ -180,7 +180,7 @@ SettingItem
popup: Popup { popup: Popup {
y: control.height - UM.Theme.getSize("default_lining").height y: control.height - UM.Theme.getSize("default_lining").height
width: control.width width: control.width
implicitHeight: contentItem.implicitHeight implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width
padding: UM.Theme.getSize("default_lining").width padding: UM.Theme.getSize("default_lining").width
contentItem: ListView { contentItem: ListView {
@ -206,6 +206,10 @@ SettingItem
contentItem: Label contentItem: Label
{ {
anchors.fill: parent
anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width
text: model.name text: model.name
renderType: Text.NativeRendering renderType: Text.NativeRendering
color: color:

6
resources/qml/Settings/SettingOptionalExtruder.qml
View File

@ -175,7 +175,7 @@ SettingItem
popup: Popup { popup: Popup {
y: control.height - UM.Theme.getSize("default_lining").height y: control.height - UM.Theme.getSize("default_lining").height
width: control.width width: control.width
implicitHeight: contentItem.implicitHeight implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width
padding: UM.Theme.getSize("default_lining").width padding: UM.Theme.getSize("default_lining").width
contentItem: ListView { contentItem: ListView {
@ -201,6 +201,10 @@ SettingItem
contentItem: Label contentItem: Label
{ {
anchors.fill: parent
anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width
text: model.name text: model.name
renderType: Text.NativeRendering renderType: Text.NativeRendering
color: color: