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 2024-01-01 20:01:46 +08:00
parent 475d293906
commit 4f66c546a8
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/FluFramelessHelper.cpp
View File

@ -265,6 +265,9 @@ void FluFramelessHelper::componentComplete(){
_fixSize = QQmlProperty(window,"fixSize");
_originalPos = QQmlProperty(window,"_originalPos");
_accentColor = QQmlProperty(window,"_accentColor");
_realHeight = QQmlProperty(window,"_realHeight");
_realWidth = QQmlProperty(window,"_realWidth");
_appBarHeight = QQmlProperty(window,"_appBarHeight");
#ifdef Q_OS_WIN
if(isCompositionEnabled()){
_accentColor.write(getAccentColor());
@ -278,16 +281,20 @@ void FluFramelessHelper::componentComplete(){
SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION);
}
SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
if(_fixSize.read().toBool()){
window->setMaximumSize(window->size());
window->setMinimumSize(window->size());
}
}else{
window->setFlags((window->flags() & (~Qt::WindowMinMaxButtonsHint) & (~Qt::Dialog)) | Qt::FramelessWindowHint | Qt::Window);
}
#else
window->setFlags((window->flags() & (~Qt::WindowMinMaxButtonsHint) & (~Qt::Dialog)) | Qt::FramelessWindowHint | Qt::Window);
#endif
int w = _realWidth.read().toInt();
int h = _realHeight.read().toInt()+_appBarHeight.read().toInt();
if(_fixSize.read().toBool()){
window->setMaximumSize(QSize(w,h));
window->setMinimumSize(QSize(w,h));
}
window->setWidth(w);
window->setHeight(h);
_onStayTopChange();
_stayTop.connectNotifySignal(this,SLOT(_onStayTopChange()));
_screen.connectNotifySignal(this,SLOT(_onScreenChanged()));

3
src/FluFramelessHelper.h
View File

@ -58,6 +58,9 @@ private:
QQmlProperty _originalPos;
QQmlProperty _fixSize;
QQmlProperty _accentColor;
QQmlProperty _realHeight;
QQmlProperty _realWidth;
QQmlProperty _appBarHeight;
};
#endif // FLUFRAMELESSHELPER_H

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

@ -61,9 +61,14 @@ Window {
property point _offsetXY : Qt.point(0,0)
property var _originalPos
property color _accentColor : FluTheme.dark ? "#333333" : "#6E6E6E"
property int _realHeight
property int _realWidth
property int _appBarHeight: appBar.height
id:window
color:"transparent"
Component.onCompleted: {
_realHeight = height
_realWidth = width
moveWindowToDesktopCenter()
useSystemAppBar = FluApp.useSystemAppBar
if(!useSystemAppBar){

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

@ -60,9 +60,14 @@ Window {
property point _offsetXY : Qt.point(0,0)
property var _originalPos
property color _accentColor : FluTheme.dark ? "#333333" : "#6E6E6E"
property int _realHeight
property int _realWidth
property int _appBarHeight: appBar.height
id:window
color:"transparent"
Component.onCompleted: {
_realHeight = height
_realWidth = width
moveWindowToDesktopCenter()
useSystemAppBar = FluApp.useSystemAppBar
if(!useSystemAppBar){