amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-07-02 08:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi
2023-08-11 22:47:36 +08:00
parent 6fe3081d23
commit 855305f197
5 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/FluApp.cpp
View File

@ -49,14 +49,14 @@ void FluApp::navigate(const QString& route,const QJsonObject& argument,FluRegist
return;
}
QVariantMap properties;
properties.insert("route",route);
properties.insert("_route",route);
if(fluRegister){
properties.insert("pageRegister",QVariant::fromValue(fluRegister));
properties.insert("_pageRegister",QVariant::fromValue(fluRegister));
}
properties.insert("argument",argument);
QQuickWindow *view=nullptr;
for (auto& pair : wnds) {
QString r = pair->property("route").toString();
QString r = pair->property("_route").toString();
if(r == route){
view = pair;
break;

39
src/imports/FluentUI/Controls/FluWindow.qml
View File

@ -1,5 +1,4 @@
import QtQuick
import QtQuick.Window
import QtQuick.Controls
import QtQuick.Layouts
import FluentUI
@ -8,10 +7,11 @@ Window {
default property alias content: container.data
property bool closeDestory: true
property int launchMode: FluWindowType.Standard
property string route
property var argument:({})
property var pageRegister
property var background : com_background
property Component loadingItem: com_loading
property var _pageRegister
property string _route
property var closeFunc: function(event){
if(closeDestory){
deleteWindow()
@ -20,26 +20,31 @@ Window {
event.accepted = false
}
}
property color backgroundColor: {
if(active){
return FluTheme.dark ? Qt.rgba(26/255,34/255,40/255,1) : Qt.rgba(238/255,244/255,249/255,1)
}
return FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
}
property alias backgroundOpacity: bg.opacity
property alias backgroundVisible: bg.visible
signal initArgument(var argument)
id:window
color:"transparent"
onClosing:(event)=>closeFunc(event)
Component.onCompleted: {
helper.initWindow(window)
initArgument(argument)
}
Rectangle{
id: bg
Connections{
target: window
function onClosing(event){closeFunc(event)}
}
Component{
id:com_background
Rectangle{
color: {
if(active){
return FluTheme.dark ? Qt.rgba(26/255,34/255,40/255,1) : Qt.rgba(238/255,244/255,249/255,1)
}
return FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
}
}
}
Loader{
anchors.fill: parent
color: backgroundColor
sourceComponent: background
}
Item{
id:container
@ -124,8 +129,8 @@ Window {
FluApp.deleteWindow(window)
}
function onResult(data){
if(pageRegister){
pageRegister.onResult(data)
if(_pageRegister){
_pageRegister.onResult(data)
}
}
}