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

RibbonWindow: Add windowStatus property. 

1. RibbonWindow.Status.Stardard: Create new window instance whether it already has one or not.
2. RibbonWindow.Status.SingleTask: If it already has one instance, the current instance will be closed and a new one will be created.
2. RibbonWindow.Status.SingleInstance: If it already has one instance, the current instance will be activated, no new instance will be created.
This commit is contained in:
Mentalflow 2024-04-20 21:54:29 +08:00
parent 6419045f0e
commit 56f21299f0
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib_source/qml/RibbonWindow.qml
View File

@ -5,7 +5,13 @@ import org.wangwenx190.FramelessHelper
Window { Window {
id:window id:window
minimumWidth: title_bar.minimumWidth minimumWidth: title_bar.minimumWidth
enum Status {
Stardard,
SingleTask,
SingleInstance
}
default property alias content: container.data default property alias content: container.data
property int windowStatus: RibbonWindow.Status.Stardard
property alias window_items: window_items property alias window_items: window_items
property alias title_bar: titleBar property alias title_bar: titleBar
property alias popup: pop property alias popup: pop
@ -114,7 +120,9 @@ Window {
function show_window(window_url, args){ function show_window(window_url, args){
let sub_windows = RibbonUI.windowsSet let sub_windows = RibbonUI.windowsSet
if (sub_windows.hasOwnProperty(window_url)) if (sub_windows.hasOwnProperty(window_url)&&sub_windows[window_url]['windowStatus'] !== RibbonWindow.Status.Stardard)
{
if (sub_windows[window_url]['windowStatus'] === RibbonWindow.Status.SingleInstance)
{ {
if (args && Object.keys(args).length) if (args && Object.keys(args).length)
{ {
@ -131,6 +139,11 @@ Window {
RibbonUI.windowsSet = sub_windows RibbonUI.windowsSet = sub_windows
return return
} }
else
{
sub_windows[window_url].close()
}
}
var component = Qt.createComponent(window_url, Component.PreferSynchronous, undefined); var component = Qt.createComponent(window_url, Component.PreferSynchronous, undefined);
if (component.status === Component.Ready) { if (component.status === Component.Ready) {
var window = component.createObject(undefined, args) var window = component.createObject(undefined, args)