3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 01:07:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'CURA-7340_fix_simulation_slider_layout' into 4.6

Browse source
This commit is contained in:
Ghostkeeper 2020-04-02 17:20:45 +02:00
commit f5669a5a27
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
resources/qml/ActionButton.qml
View file

@ -86,10 +86,20 @@ Button
renderType: Text.NativeRendering renderType: Text.NativeRendering
height: parent.height height: parent.height
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
width: fixedWidthMode ? button.width - button.leftPadding - button.rightPadding : ((maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined)
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight elide: Text.ElideRight
Binding
{
// When settting width directly, an unjust binding loop warning would be triggered,
// because button.width is part of this expression.
// Using parent.width is fine in fixedWidthMode.
target: buttonText
property: "width"
value: button.fixedWidthMode ? button.width - button.leftPadding - button.rightPadding
: ((maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined)
}
} }
//Right side icon. Only displayed if isIconOnRightSide. //Right side icon. Only displayed if isIconOnRightSide.

1
resources/qml/ActionPanel/ActionPanelWidget.qml
View file

@ -15,6 +15,7 @@ import Cura 1.0 as Cura
Item Item
{ {
id: base id: base
width: actionPanelWidget.width + additionalComponents.width
height: childrenRect.height height: childrenRect.height
visible: CuraApplication.platformActivity visible: CuraApplication.platformActivity