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

Merge pull request #4086 from Ultimaker/fix_blank_dropdown

Browse Source 
Fix blank dropdown panel in the comboboxes
This commit is contained in:
Lipu Fei 2018-07-16 15:15:48 +02:00 committed by GitHub
commit 4ab3e27dff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 {
y: control.height - UM.Theme.getSize("default_lining").height
width: control.width
implicitHeight: contentItem.implicitHeight
implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width
padding: UM.Theme.getSize("default_lining").width
contentItem: ListView {
@ -117,8 +117,9 @@ SettingItem
contentItem: Label
{
// FIXME: Somehow the top/bottom anchoring is not correct on Linux and it results in invisible texts.
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.fill: parent
anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width
anchors.rightMargin: UM.Theme.getSize("setting_unit_margin").width
text: modelData.value
renderType: Text.NativeRendering

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

@ -180,7 +180,7 @@ SettingItem
popup: Popup {
y: control.height - UM.Theme.getSize("default_lining").height
width: control.width
implicitHeight: contentItem.implicitHeight
implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width
padding: UM.Theme.getSize("default_lining").width
contentItem: ListView {
@ -206,6 +206,10 @@ SettingItem
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
renderType: Text.NativeRendering
color:

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

@ -175,7 +175,7 @@ SettingItem
popup: Popup {
y: control.height - UM.Theme.getSize("default_lining").height
width: control.width
implicitHeight: contentItem.implicitHeight
implicitHeight: contentItem.implicitHeight + 2 * UM.Theme.getSize("default_lining").width
padding: UM.Theme.getSize("default_lining").width
contentItem: ListView {
@ -201,6 +201,10 @@ SettingItem
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
renderType: Text.NativeRendering
color: