From 669f6d8f0cb782a7bcd71943d9ab87fe9846d419 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 9 Jan 2019 17:04:51 +0100 Subject: [PATCH] Fix available space bug Contributes to CL-1165 --- .../resources/qml/MonitorInfoBlurb.qml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml index f7d37b989a..58b354afcf 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorInfoBlurb.qml @@ -3,7 +3,6 @@ import QtQuick 2.3 import QtQuick.Controls 2.0 -import QtQuick.Dialogs 1.1 import UM 1.3 as UM /** @@ -22,7 +21,13 @@ Item id: popUp // If the pop-up won't fit in the window, flip it - direction: target.y + target.height + contentWrapper.implicitHeight < monitorFrame.height ? "top" : "bottom" + direction: + { + var availableSpace = monitorFrame.height + var targetPosition = target.mapToItem(null, 0, 0) + var requiredSpace = targetPosition.y + target.height + contentWrapper.implicitHeight + return requiredSpace < availableSpace ? "top" : "bottom" + } // Use dark grey for info blurbs and white for context menus color: "#191919" // TODO: Theme!