-
-
Notifications
You must be signed in to change notification settings - Fork 482
fix(thermal): decouple widget click from sort state; add tab-aware modal routing via openWidgetPopout #2690
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.
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
Open
louzt
wants to merge
3
commits into
AvengeMedia:master
Choose a base branch
from
louzt:fix/thermal-widget-routing-v2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,6 +39,8 @@ Singleton { | |
| property var powerMenuModal: null | ||
| property var processListModal: null | ||
| property var processListModalLoader: null | ||
| // Pending tab index for async Loader path — consumed by Connections when modal loads | ||
| property int pendingProcessTab: -1 | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. processListModalLoader is not asynchronous so I dont think we need this or the connections block. |
||
| property var colorPickerModal: null | ||
| property var notificationModal: null | ||
| property var wifiPasswordModal: null | ||
|
|
@@ -759,12 +761,12 @@ Singleton { | |
| } | ||
| } | ||
|
|
||
| function showProcessListModal() { | ||
| function showProcessListModal(tabIndex) { | ||
| if (processListModal) { | ||
| processListModal.show(); | ||
| processListModal.show(tabIndex); | ||
| } else if (processListModalLoader) { | ||
| pendingProcessTab = (tabIndex !== undefined && tabIndex !== null) ? tabIndex : -1; | ||
| processListModalLoader.active = true; | ||
| Qt.callLater(() => processListModal?.show()); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -779,12 +781,26 @@ Singleton { | |
| } | ||
| } | ||
|
|
||
| function toggleProcessListModal() { | ||
| function toggleProcessListModal(tabIndex) { | ||
| if (processListModal) { | ||
| processListModal.toggle(); | ||
| processListModal.toggle(tabIndex); | ||
| } else if (processListModalLoader) { | ||
| pendingProcessTab = (tabIndex !== undefined && tabIndex !== null) ? tabIndex : -1; | ||
| processListModalLoader.active = true; | ||
| Qt.callLater(() => processListModal?.show()); | ||
| } | ||
| } | ||
|
|
||
| // Reactive async path: when Loader finishes loading, show modal at pending tab. | ||
| // Avoids Qt.callLater race condition where the lambda fires before modal is ready. | ||
| Connections { | ||
| target: processListModalLoader | ||
| function onStatusChanged() { | ||
| if (!processListModalLoader) | ||
| return; | ||
| if (processListModalLoader.status === Loader.Ready && pendingProcessTab !== -1) { | ||
| processListModal?.show(pendingProcessTab); | ||
| pendingProcessTab = -1; | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The popout variant of ProcessList doesnt have tabs, only the modal variant does