amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-26 13:27:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-12-20 21:58:59 +08:00
parent 0b7358af41
commit 1c67f2a41b
4 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/FluTools.cpp
View File

@ -179,3 +179,18 @@ qint64 FluTools::currentTimestamp(){
QIcon FluTools::windowIcon(){
return QGuiApplication::windowIcon();
}
int FluTools::cursorScreenIndex(){
int screenIndex = 0;
int screenCount = qApp->screens().count();
if (screenCount > 1) {
QPoint pos = QCursor::pos();
for (int i = 0; i < screenCount; ++i) {
if (qApp->screens().at(i)->geometry().contains(pos)) {
screenIndex = i;
break;
}
}
}
return screenIndex;
}

2
src/FluTools.h
View File

@ -5,6 +5,7 @@
#include <QFile>
#include <QColor>
#include <QtQml/qqml.h>
#include <QScreen>
#include "singleton.h"
/**
@ -50,6 +51,7 @@ public:
Q_INVOKABLE qint64 currentTimestamp();
Q_INVOKABLE QPoint cursorPos();
Q_INVOKABLE QIcon windowIcon();
Q_INVOKABLE int cursorScreenIndex();
};
#endif // FLUTOOLS_H

11
src/Qt5/imports/FluentUI/Controls/FluWindow.qml
View File

@ -53,19 +53,15 @@ Window {
signal initArgument(var argument)
signal firstVisible()
id:window
maximumWidth: fixSize ? width : 16777215
maximumHeight: fixSize ? height : 16777215
minimumWidth: fixSize ? width : 0
minimumHeight: fixSize ? height : 0
color:"transparent"
Component.onCompleted: {
moveWindowToDesktopCenter()
useSystemAppBar = FluApp.useSystemAppBar
if(!useSystemAppBar){
loader_frameless.sourceComponent = com_frameless
}
lifecycle.onCompleted(window)
initArgument(argument)
moveWindowToDesktopCenter()
if(window.autoMaximize){
window.showMaximized()
}else{
@ -286,7 +282,12 @@ Window {
return lifecycle.createRegister(window,path)
}
function moveWindowToDesktopCenter(){
screen = Qt.application.screens[FluTools.cursorScreenIndex()]
window.setGeometry((Screen.width-window.width)/2+Screen.virtualX,(Screen.height-window.height)/2+Screen.virtualY,window.width,window.height)
maximumWidth = fixSize ? width : 16777215
maximumHeight = fixSize ? height : 16777215
minimumWidth = fixSize ? width : 0
minimumHeight = fixSize ? height : 0
}
function onResult(data){
if(_pageRegister){

11
src/Qt6/imports/FluentUI/Controls/FluWindow.qml
View File

@ -52,19 +52,15 @@ Window {
signal initArgument(var argument)
signal firstVisible()
id:window
maximumWidth: fixSize ? width : 16777215
maximumHeight: fixSize ? height : 16777215
minimumWidth: fixSize ? width : 0
minimumHeight: fixSize ? height : 0
color:"transparent"
Component.onCompleted: {
moveWindowToDesktopCenter()
useSystemAppBar = FluApp.useSystemAppBar
if(!useSystemAppBar){
loader_frameless.sourceComponent = com_frameless
}
lifecycle.onCompleted(window)
initArgument(argument)
moveWindowToDesktopCenter()
if(window.autoMaximize){
window.showMaximized()
}else{
@ -285,7 +281,12 @@ Window {
return lifecycle.createRegister(window,path)
}
function moveWindowToDesktopCenter(){
screen = Qt.application.screens[FluTools.cursorScreenIndex()]
window.setGeometry((Screen.width-window.width)/2+Screen.virtualX,(Screen.height-window.height)/2+Screen.virtualY,window.width,window.height)
maximumWidth = fixSize ? width : 16777215
maximumHeight = fixSize ? height : 16777215
minimumWidth = fixSize ? width : 0
minimumHeight = fixSize ? height : 0
}
function onResult(data){
if(_pageRegister){