Mentalflow
/
RibbonUI
mirror of https://github.com/mentalfl0w/RibbonUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RibbonWindow: Use an unified set to store sub windows pointers.

This commit is contained in:
Mentalflow 2024-04-20 21:09:40 +08:00
parent 87c11a384a
commit 6419045f0e
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib_source/qml/RibbonWindow.qml
View File

@ -10,7 +10,6 @@ Window {
property alias title_bar: titleBar
property alias popup: pop
property bool comfirmed_quit: false
property var sub_windows: ({})
visible: false
color: {
if (FramelessHelper.blurBehindWindowEnabled) {
@ -114,6 +113,7 @@ Window {
}
function show_window(window_url, args){
let sub_windows = RibbonUI.windowsSet
if (sub_windows.hasOwnProperty(window_url))
{
if (args && Object.keys(args).length)
@ -128,15 +128,24 @@ Window {
}
sub_windows[window_url].raise()
sub_windows[window_url].requestActivate()
RibbonUI.windowsSet = sub_windows
return
}
var component = Qt.createComponent(window_url, Component.PreferSynchronous, undefined);
if (component.status === Component.Ready) {
var window = component.createObject(undefined, args);
var window = component.createObject(undefined, args)
if (!(window instanceof Window))
{
console.error("RibbonWindow: Error loading Window: Instance is not Window.")
return
}
sub_windows[window_url] = window
RibbonUI.windowsSet = sub_windows
window.onClosing.connect(function() {
window.destroy()
let sub_windows = RibbonUI.windowsSet
delete sub_windows[window_url]
RibbonUI.windowsSet = sub_windows
});
window.raise()
window.requestActivate()

1
lib_source/ribbonui.h
View File

@ -16,6 +16,7 @@ class RibbonUI : public QQuickItem
Q_PROPERTY_R(QString, version)
Q_PROPERTY_R(int, qt_version)
Q_PROPERTY_R(int, is_win11)
Q_PROPERTY_RW(QVariantMap, windowsSet)
public:
static RibbonUI* instance();
static RibbonUI* create(QQmlEngine *qmlEngine, QJSEngine *jsEngine){return instance();}