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

Adjust the minimum size to be something around 1280x1024.

Browse Source 
Also adjust some colors color for the dark theme.

Contributes to CURA-5772.
This commit is contained in:
Diego Prado Gesto 2018-10-25 17:41:35 +02:00
parent e85b5febe1
commit e64698209c
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/PrepareStage/PrepareMenu.qml
View File

@ -46,7 +46,7 @@ Item
Cura.MachineSelector Cura.MachineSelector
{ {
id: machineSelection id: machineSelection
width: UM.Theme.getSize("sidebar").width width: Math.round(0.8 * UM.Theme.getSize("sidebar").width) - configSelection.width
height: prepareMenu.height height: prepareMenu.height
} }
@ -54,8 +54,8 @@ Item
{ {
id: configSelection id: configSelection
visible: isNetworkPrinter && printerConnected visible: isNetworkPrinter && printerConnected
width: visible ? Math.round(machineSelection.width * 0.15) : 0 width: visible ? Math.round(UM.Theme.getSize("sidebar").width * 0.15) : 0
panelWidth: machineSelection.width panelWidth: Math.round(0.8 * UM.Theme.getSize("sidebar").width)
height: prepareMenu.height height: prepareMenu.height
} }

6
resources/qml/ProgressAndSaveWidget.qml → resources/qml/ActionPanelWidget.qml
View File

@ -19,7 +19,9 @@ Rectangle
signal showTooltip(Item item, point location, string text) signal showTooltip(Item item, point location, string text)
signal hideTooltip() signal hideTooltip()
// Also add an extra margin, as we ant some breathing room around the edges. color: UM.Theme.getColor("sidebar")
// Also add an extra margin, as we want some breathing room around the edges.
height: saveButton.height + UM.Theme.getSize("sidebar_margin").height height: saveButton.height + UM.Theme.getSize("sidebar_margin").height
Label Label
{ {
@ -231,7 +233,7 @@ Rectangle
{ {
id: saveButton id: saveButton
width: parent.width width: parent.width
height: 100 height: 100 * screenScaleFactor
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
} }
} }

3
resources/qml/Cura.qml
View File

@ -291,6 +291,7 @@ UM.MainWindow
onActiveViewChanged: viewModeButton.updateItemActiveFlags() onActiveViewChanged: viewModeButton.updateItemActiveFlags()
} }
} }
Loader Loader
{ {
id: viewPanel id: viewPanel
@ -307,7 +308,7 @@ UM.MainWindow
source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : "" source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : ""
} }
ProgressAndSaveWidget Cura.ActionPanelWidget
{ {
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom

3
resources/qml/qmldir
View File

@ -6,4 +6,5 @@ CustomConfigurationSelector 1.0 CustomConfigurationSelector.qml
PrintSetupSelector 1.0 PrintSetupSelector.qml PrintSetupSelector 1.0 PrintSetupSelector.qml
ActionButton 1.0 ActionButton.qml ActionButton 1.0 ActionButton.qml
MaterialMenu 1.0 MaterialMenu.qml MaterialMenu 1.0 MaterialMenu.qml
NozzleMenu 1.0 NozzleMenu.qml NozzleMenu 1.0 NozzleMenu.qml
ActionPanelWidget 1.0 ActionPanelWidget.qml

2
resources/themes/cura-light/theme.json
View File

@ -345,7 +345,7 @@
}, },
"sizes": { "sizes": {
"window_minimum_size": [70, 50], "window_minimum_size": [106, 85],
"main_window_header": [0.0, 4.5], "main_window_header": [0.0, 4.5],
"main_window_header_button": [8, 4], "main_window_header_button": [8, 4],