From 9404fe0fb993247bd9495ce1a7ec161a266fd77a Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 5 Jun 2020 14:17:21 +0200 Subject: [PATCH] Fix getting contentWidth in variable width mode Undefined seems to work fine as well though. Done during Turbo Testing and Tooling to reduce the number of warnings in our log. --- resources/qml/ActionButton.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/ActionButton.qml b/resources/qml/ActionButton.qml index b0849ea6b8..a38b47df8f 100644 --- a/resources/qml/ActionButton.qml +++ b/resources/qml/ActionButton.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2020 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.7 @@ -98,7 +98,7 @@ Button target: buttonText property: "width" value: button.fixedWidthMode ? button.width - button.leftPadding - button.rightPadding - : ((maximumWidth != 0 && parent.contentWidth > maximumWidth) ? maximumWidth : undefined) + : ((maximumWidth != 0 && button.contentWidth > maximumWidth) ? maximumWidth : undefined) } }