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

Fix style for the open file button in the prepare menu.

Browse Source 
Contributes to CURA-5942.
This commit is contained in:
Diego Prado Gesto 2018-11-26 15:08:33 +01:00
parent 0a1c0e18d1
commit 84f263f111
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/PrepareStage/PrepareMenu.qml
View File

@ -3,7 +3,7 @@
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls 1.4 import QtQuick.Controls 2.3
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.1 as Cura import Cura 1.1 as Cura
@ -27,14 +27,14 @@ Item
Item Item
{ {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: openFileButtonBackground.width + itemRow.width + UM.Theme.getSize("default_margin").width width: openFileButton.width + itemRow.width + UM.Theme.getSize("default_margin").width
height: parent.height height: parent.height
RowLayout RowLayout
{ {
id: itemRow id: itemRow
anchors.left: openFileButtonBackground.right anchors.left: openFileButton.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
width: Math.round(0.9 * prepareMenu.width) width: Math.round(0.9 * prepareMenu.width)
@ -44,7 +44,7 @@ Item
Cura.MachineSelector Cura.MachineSelector
{ {
id: machineSelection id: machineSelection
z: openFileButtonBackground.z - 1 //Ensure that the tooltip of the open file button stays above the item row. z: openFileButton.z - 1 //Ensure that the tooltip of the open file button stays above the item row.
headerCornerSide: Cura.RoundedRectangle.Direction.Left headerCornerSide: Cura.RoundedRectangle.Direction.Left
Layout.minimumWidth: UM.Theme.getSize("machine_selector_widget").width Layout.minimumWidth: UM.Theme.getSize("machine_selector_widget").width
Layout.maximumWidth: UM.Theme.getSize("machine_selector_widget").width Layout.maximumWidth: UM.Theme.getSize("machine_selector_widget").width
@ -86,24 +86,31 @@ Item
} }
} }
Rectangle Button
{ {
id: openFileButtonBackground id: openFileButton
height: UM.Theme.getSize("stage_menu").height height: UM.Theme.getSize("stage_menu").height
width: UM.Theme.getSize("stage_menu").height width: UM.Theme.getSize("stage_menu").height
onClicked: Cura.Actions.open.trigger()
radius: UM.Theme.getSize("default_radius").width contentItem: UM.RecolorImage
color: UM.Theme.getColor("toolbar_background")
Button
{ {
id: openFileButton id: buttonIcon
text: catalog.i18nc("@action:button", "Open File") source: UM.Theme.getIcon("load")
iconSource: UM.Theme.getIcon("load") width: UM.Theme.getSize("button_icon").width
style: UM.Theme.styles.toolbar_button height: UM.Theme.getSize("button_icon").height
tooltip: "" color: UM.Theme.getColor("toolbar_button_text")
action: Cura.Actions.open
anchors.centerIn: parent sourceSize: UM.Theme.getSize("button_icon")
}
background: Rectangle
{
height: UM.Theme.getSize("stage_menu").height
width: UM.Theme.getSize("stage_menu").height
radius: UM.Theme.getSize("default_radius").width
color: openFileButton.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
} }
} }
} }