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

Revert "Fix binding loop in action panel widget"

Browse Source 
Fix improper player slider layout which was introduced in 5cfe71e5
This commit is contained in:
Nino van Hooff 2020-04-02 15:15:05 +02:00
parent cbccb08103
commit 6d56b52913
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
resources/qml/ActionButton.qml
View File

@ -49,6 +49,15 @@ Button
height: UM.Theme.getSize("action_button").height height: UM.Theme.getSize("action_button").height
hoverEnabled: true hoverEnabled: true
Component.onCompleted: {
if(fixedWidthMode){
buttonText.width = width - leftPadding - rightPadding
} else {
buttonText.width = (maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined
}
}
contentItem: Row contentItem: Row
{ {
spacing: UM.Theme.getSize("narrow_margin").width spacing: UM.Theme.getSize("narrow_margin").width
@ -84,9 +93,9 @@ Button
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
visible: text != "" visible: text != ""
renderType: Text.NativeRendering renderType: Text.NativeRendering
// width is set by parent because it depends on button.fixedWidthMode
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

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