Merge pull request #931 from Ultimaker/CURA-11458

Qt upgrade issues
Ultimaker · Jan 2, 2024 · a0abe00 · a0abe00
2 parents 6c8c65a + d34790e
commit a0abe00
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/UM/Qt/qml/UM/MessageStack.qml b/UM/Qt/qml/UM/MessageStack.qml
@@ -12,6 +12,7 @@ ListView
     id: base
     boundsBehavior: ListView.StopAtBounds
     verticalLayoutDirection: ListView.BottomToTop
+    width: UM.Theme.getSize("message").width
 
     model: UM.VisibleMessagesModel { }
     spacing: UM.Theme.getSize("default_margin").height
@@ -88,14 +89,15 @@ ListView
                 margins: UM.Theme.getSize("default_margin").width
             }
 
-            height: Math.max(messageTypeIcon.height, messageTitle.height)
+            height: messageTypeIcon.visible? Math.max(messageTypeIcon.height, messageTitle.height): messageTitle.height
             UM.StatusIcon
             {
                 id: messageTypeIcon
-                visible: status != UM.StatusIcon.Status.NEUTRAL
+                visible: state !== UM.StatusIcon.Status.NEUTRAL
                 height: visible ? UM.Theme.getSize("message_type_icon").height: 0
                 width: visible ? UM.Theme.getSize("message_type_icon").height : 0
-                status:
+                status: state
+                property var state:
                 {
                     switch (model.message_type)
                     {

diff --git a/UM/TaskManagement/TaskManager.py b/UM/TaskManagement/TaskManager.py
@@ -17,7 +17,7 @@ class _CallFunctionEvent(QEvent):
 
     def __init__(self, task_manager: "TaskManager", func: Callable, args: Any, kwargs: Any,
                  delay: Optional[float] = None) -> None:
-        super().__init__(task_manager.event_type)
+        super().__init__(QEvent.Type(task_manager.event_type))
 
         self._task_manager = task_manager
         self._function = func