mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-10 07:09:02 +08:00
Adjust the minimum size to be something around 1280x1024.
Also adjust some colors color for the dark theme. Contributes to CURA-5772.
This commit is contained in:
parent
e85b5febe1
commit
e64698209c
@ -46,7 +46,7 @@ Item
|
||||
Cura.MachineSelector
|
||||
{
|
||||
id: machineSelection
|
||||
width: UM.Theme.getSize("sidebar").width
|
||||
width: Math.round(0.8 * UM.Theme.getSize("sidebar").width) - configSelection.width
|
||||
height: prepareMenu.height
|
||||
}
|
||||
|
||||
@ -54,8 +54,8 @@ Item
|
||||
{
|
||||
id: configSelection
|
||||
visible: isNetworkPrinter && printerConnected
|
||||
width: visible ? Math.round(machineSelection.width * 0.15) : 0
|
||||
panelWidth: machineSelection.width
|
||||
width: visible ? Math.round(UM.Theme.getSize("sidebar").width * 0.15) : 0
|
||||
panelWidth: Math.round(0.8 * UM.Theme.getSize("sidebar").width)
|
||||
height: prepareMenu.height
|
||||
}
|
||||
|
||||
|
@ -19,7 +19,9 @@ Rectangle
|
||||
signal showTooltip(Item item, point location, string text)
|
||||
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
|
||||
Label
|
||||
{
|
||||
@ -231,7 +233,7 @@ Rectangle
|
||||
{
|
||||
id: saveButton
|
||||
width: parent.width
|
||||
height: 100
|
||||
height: 100 * screenScaleFactor
|
||||
anchors.bottom: parent.bottom
|
||||
}
|
||||
}
|
@ -291,6 +291,7 @@ UM.MainWindow
|
||||
onActiveViewChanged: viewModeButton.updateItemActiveFlags()
|
||||
}
|
||||
}
|
||||
|
||||
Loader
|
||||
{
|
||||
id: viewPanel
|
||||
@ -307,7 +308,7 @@ UM.MainWindow
|
||||
source: UM.ActiveView.valid ? UM.ActiveView.activeViewPanel : ""
|
||||
}
|
||||
|
||||
ProgressAndSaveWidget
|
||||
Cura.ActionPanelWidget
|
||||
{
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: parent.bottom
|
||||
|
@ -6,4 +6,5 @@ CustomConfigurationSelector 1.0 CustomConfigurationSelector.qml
|
||||
PrintSetupSelector 1.0 PrintSetupSelector.qml
|
||||
ActionButton 1.0 ActionButton.qml
|
||||
MaterialMenu 1.0 MaterialMenu.qml
|
||||
NozzleMenu 1.0 NozzleMenu.qml
|
||||
NozzleMenu 1.0 NozzleMenu.qml
|
||||
ActionPanelWidget 1.0 ActionPanelWidget.qml
|
@ -345,7 +345,7 @@
|
||||
},
|
||||
|
||||
"sizes": {
|
||||
"window_minimum_size": [70, 50],
|
||||
"window_minimum_size": [106, 85],
|
||||
|
||||
"main_window_header": [0.0, 4.5],
|
||||
"main_window_header_button": [8, 4],
|
||||
|
Loading…
x
Reference in New Issue
Block a user