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

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-05-01 01:11:25 +08:00
parent e471d5a230
commit 0b1755e9eb
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/FluFrameless.cpp
View File

@ -162,8 +162,8 @@ void FluFrameless::componentComplete() {
} }
return false; return false;
} else if (uMsg == WM_NCCALCSIZE) { } else if (uMsg == WM_NCCALCSIZE) {
const auto clientRect = ((wParam == FALSE) ? reinterpret_cast<LPRECT>(lParam) : &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(lParam))->rgrc[0]);
bool isMaximum = ::IsZoomed(hwnd); bool isMaximum = ::IsZoomed(hwnd);
const auto clientRect = ((wParam == FALSE) ? reinterpret_cast<LPRECT>(lParam) : &(reinterpret_cast<LPNCCALCSIZE_PARAMS>(lParam))->rgrc[0]);
const LONG originalTop = clientRect->top; const LONG originalTop = clientRect->top;
const LONG originalLeft = clientRect->left; const LONG originalLeft = clientRect->left;
const LONG originalBottom = clientRect->bottom; const LONG originalBottom = clientRect->bottom;
@ -186,6 +186,9 @@ void FluFrameless::componentComplete() {
clientRect->bottom = originalBottom - offsetXY; clientRect->bottom = originalBottom - offsetXY;
clientRect->left = originalLeft + offsetXY; clientRect->left = originalLeft + offsetXY;
clientRect->right = originalRight - offsetXY; clientRect->right = originalRight - offsetXY;
#if (QT_VERSION == QT_VERSION_CHECK(6, 5, 3) || QT_VERSION == QT_VERSION_CHECK(6, 6, 0))
qWarning("This issue is Qt's own bug, which currently only exists in 6.5.3 and 6.6.0, and has been fixed in later versions");
#endif
} }
_setMaximizeHovered(false); _setMaximizeHovered(false);
*result = WVR_REDRAW; *result = WVR_REDRAW;

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

@ -62,7 +62,7 @@ Window {
property string _route property string _route
property bool _hideShadow: false property bool _hideShadow: false
id: window id: window
color:"transparent" color: FluTools.isSoftware() ? window.backgroundColor : "transparent"
Component.onCompleted: { Component.onCompleted: {
FluRouter.addWindow(window) FluRouter.addWindow(window)
useSystemAppBar = FluApp.useSystemAppBar useSystemAppBar = FluApp.useSystemAppBar

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

@ -61,7 +61,7 @@ Window {
property string _route property string _route
property bool _hideShadow: false property bool _hideShadow: false
id: window id: window
color:"transparent" color: FluTools.isSoftware() ? window.backgroundColor : "transparent"
Component.onCompleted: { Component.onCompleted: {
FluRouter.addWindow(window) FluRouter.addWindow(window)
useSystemAppBar = FluApp.useSystemAppBar useSystemAppBar = FluApp.useSystemAppBar