Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qt upgrade issues #931

Merged
merged 3 commits into from
Jan 2, 2024
Merged

Qt upgrade issues #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f6f6e8
providing width to listview
saumyaj3 Dec 27, 2023
ab3b907
status redefined
saumyaj3 Dec 27, 2023
d34790e
making status symbol visible
saumyaj3 Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions UM/Qt/qml/UM/MessageStack.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion UM/TaskManagement/TaskManager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down