3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-02 23:31:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge branch 'CURA-8127_settings_visibility_osx_fix' of github.com:Ultimaker/Cura into 4.9

Browse source
This commit is contained in:
Jaime van Kessel 2021-04-09 09:37:37 +02:00
commit dbef89ea89
No known key found for this signature in database
GPG key ID: 3710727397403C91
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
resources/qml/Preferences/SettingVisibilityPage.qml
View file

@ -5,6 +5,8 @@ import QtQuick 2.1
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.1
import QtQuick.Controls 2.3 as NewControls
import UM 1.2 as UM import UM 1.2 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
@ -96,7 +98,7 @@ UM.PreferencesPage
onTextChanged: definitionsModel.filter = {"i18n_label": "*" + text} onTextChanged: definitionsModel.filter = {"i18n_label": "*" + text}
} }
ComboBox NewControls.ComboBox
{ {
id: visibilityPreset id: visibilityPreset
width: 150 * screenScaleFactor width: 150 * screenScaleFactor
@ -104,6 +106,7 @@ UM.PreferencesPage
{ {
top: parent.top top: parent.top
right: parent.right right: parent.right
bottom: scrollView.top
} }
model: settingVisibilityPresetsModel.items model: settingVisibilityPresetsModel.items