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

update

Browse Source
This commit is contained in:
zhuzichu 2024-01-02 16:56:28 +08:00
parent 0241ecd07f
commit 1464e647d9
6 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/FluFramelessHelper.cpp
View File

@ -1,11 +1,13 @@
#include "FluFramelessHelper.h" #include "FluFramelessHelper.h"
#include <QGuiApplication> #include <QGuiApplication>
#include <QScreen>
#include "FluTools.h" #include "FluTools.h"
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#pragma comment (lib,"user32.lib") #pragma comment (lib,"user32.lib")
#pragma comment (lib,"dwmapi.lib") #pragma comment (lib,"dwmapi.lib")
#include <windows.h> #include <windows.h>
#include <windowsx.h>
#include <dwmapi.h> #include <dwmapi.h>
static inline QByteArray qtNativeEventType() static inline QByteArray qtNativeEventType()
@ -87,7 +89,7 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
} }
const auto msg = static_cast<const MSG *>(message); const auto msg = static_cast<const MSG *>(message);
const HWND hwnd = msg->hwnd; const HWND hwnd = msg->hwnd;
if (!hwnd) { if (!hwnd || !msg) {
return false; return false;
} }
const qint64 wid = reinterpret_cast<qint64>(hwnd); const qint64 wid = reinterpret_cast<qint64>(hwnd);
@ -95,10 +97,6 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
return false; return false;
} }
const UINT uMsg = msg->message; const UINT uMsg = msg->message;
if (!msg || !hwnd)
{
return false;
}
const WPARAM wParam = msg->wParam; const WPARAM wParam = msg->wParam;
const LPARAM lParam = msg->lParam; const LPARAM lParam = msg->lParam;
if(uMsg == WM_WINDOWPOSCHANGING){ if(uMsg == WM_WINDOWPOSCHANGING){
@ -113,23 +111,29 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
}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]); 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 originalBottom = clientRect->bottom;
const LONG originalLeft = clientRect->left; const LONG originalLeft = clientRect->left;
const LONG originalRight= clientRect->right;
const LRESULT hitTestResult = ::DefWindowProcW(hwnd, WM_NCCALCSIZE, wParam, lParam); const LRESULT hitTestResult = ::DefWindowProcW(hwnd, WM_NCCALCSIZE, wParam, lParam);
if ((hitTestResult != HTERROR) && (hitTestResult != HTNOWHERE)) { if ((hitTestResult != HTERROR) && (hitTestResult != HTNOWHERE)) {
*result = hitTestResult; *result = hitTestResult;
return true; return true;
} }
if(IsZoomed(hwnd)){ int offsetTop = 0;
bool isMax = IsZoomed(hwnd);
if(isMax){
_helper->setOriginalPos(QPoint(originalLeft,originalTop)); _helper->setOriginalPos(QPoint(originalLeft,originalTop));
if(isTaskbarAutoHide()){ if(isTaskbarAutoHide()){
clientRect->bottom -= 1; clientRect->bottom -= 1;
} }
offsetTop = 0;
}else{ }else{
_helper->setOriginalPos({}); _helper->setOriginalPos({});
if(FluTools::getInstance()->isWindows11OrGreater()){
offsetTop = 0;
}else{
offsetTop = 1;
}
} }
clientRect->top = originalTop + 1; clientRect->top = originalTop+offsetTop;
*result = WVR_REDRAW; *result = WVR_REDRAW;
return true; return true;
}if(uMsg == WM_NCHITTEST){ }if(uMsg == WM_NCHITTEST){
@ -156,10 +160,15 @@ bool FramelessEventFilter::nativeEventFilter(const QByteArray &eventType, void *
}else if(uMsg == WM_NCPAINT){ }else if(uMsg == WM_NCPAINT){
*result = 0; *result = 0;
return true; return true;
} }else if(uMsg == WM_NCACTIVATE){
else if(uMsg == WM_NCACTIVATE){
*result = DefWindowProcW(hwnd, WM_NCACTIVATE, wParam, -1); *result = DefWindowProcW(hwnd, WM_NCACTIVATE, wParam, -1);
return true; return true;
}else if(uMsg == WM_SYSCOMMAND){
const WPARAM filteredWParam = (wParam & 0xFFF0);
if (filteredWParam == SC_MAXIMIZE) {
_helper->window->showMaximized();
return true;
}
} }
return false; return false;
#endif #endif
@ -278,7 +287,7 @@ void FluFramelessHelper::componentComplete(){
_appBarHeight = QQmlProperty(window,"_appBarHeight"); _appBarHeight = QQmlProperty(window,"_appBarHeight");
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
if(isCompositionEnabled()){ if(isCompositionEnabled()){
window->setFlags(Qt::Window|Qt::CustomizeWindowHint); window->setFlag(Qt::CustomizeWindowHint,true);
_nativeEvent =new FramelessEventFilter(this); _nativeEvent =new FramelessEventFilter(this);
qApp->installNativeEventFilter(_nativeEvent); qApp->installNativeEventFilter(_nativeEvent);
HWND hwnd = reinterpret_cast<HWND>(window->winId()); HWND hwnd = reinterpret_cast<HWND>(window->winId());
@ -308,6 +317,7 @@ void FluFramelessHelper::componentComplete(){
_stayTop.connectNotifySignal(this,SLOT(_onStayTopChange())); _stayTop.connectNotifySignal(this,SLOT(_onStayTopChange()));
_screen.connectNotifySignal(this,SLOT(_onScreenChanged())); _screen.connectNotifySignal(this,SLOT(_onScreenChanged()));
window->installEventFilter(this); window->installEventFilter(this);
Q_EMIT loadCompleted();
} }
} }
@ -324,7 +334,7 @@ void FluFramelessHelper::showSystemMenu(){
QPoint point = QCursor::pos(); QPoint point = QCursor::pos();
HWND hwnd = reinterpret_cast<HWND>(window->winId()); HWND hwnd = reinterpret_cast<HWND>(window->winId());
DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE); DWORD style = GetWindowLongPtr(hwnd,GWL_STYLE);
SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION | WS_SYSMENU | WS_MAXIMIZEBOX); SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_SYSMENU);
const HMENU hMenu = ::GetSystemMenu(hwnd, FALSE); const HMENU hMenu = ::GetSystemMenu(hwnd, FALSE);
DeleteMenu(hMenu, SC_MOVE, MF_BYCOMMAND); DeleteMenu(hMenu, SC_MOVE, MF_BYCOMMAND);
DeleteMenu(hMenu, SC_SIZE, MF_BYCOMMAND); DeleteMenu(hMenu, SC_SIZE, MF_BYCOMMAND);
@ -342,7 +352,7 @@ void FluFramelessHelper::showSystemMenu(){
if (result != FALSE) { if (result != FALSE) {
PostMessageW(hwnd, WM_SYSCOMMAND, result, 0); PostMessageW(hwnd, WM_SYSCOMMAND, result, 0);
} }
SetWindowLongPtr(hwnd, GWL_STYLE, style | WS_THICKFRAME | WS_CAPTION &~ WS_SYSMENU); SetWindowLongPtr(hwnd, GWL_STYLE, style &~ WS_SYSMENU);
#endif #endif
} }

1
src/FluFramelessHelper.h
View File

@ -41,6 +41,7 @@ public:
QObject* maximizeButton(); QObject* maximizeButton();
void setOriginalPos(QVariant pos); void setOriginalPos(QVariant pos);
Q_INVOKABLE void showSystemMenu(); Q_INVOKABLE void showSystemMenu();
Q_SIGNAL void loadCompleted();
protected: protected:
bool eventFilter(QObject *obj, QEvent *event) override; bool eventFilter(QObject *obj, QEvent *event) override;
private: private:

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

@ -8,7 +8,7 @@ Button {
property string contentDescription: "" property string contentDescription: ""
QtObject{ QtObject{
id:d id:d
property bool checked: rect_back.height == background.height property bool checked: (rect_back.height === background.height) && (progress === 1)
} }
property color normalColor: { property color normalColor: {
if(d.checked){ if(d.checked){

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

@ -70,6 +70,7 @@ Window {
_realHeight = height _realHeight = height
_realWidth = width _realWidth = width
moveWindowToDesktopCenter() moveWindowToDesktopCenter()
fixWindowSize()
useSystemAppBar = FluApp.useSystemAppBar useSystemAppBar = FluApp.useSystemAppBar
if(!useSystemAppBar){ if(!useSystemAppBar){
loader_frameless_helper.sourceComponent = com_frameless loader_frameless_helper.sourceComponent = com_frameless
@ -120,7 +121,11 @@ Window {
} }
Component{ Component{
id:com_frameless id:com_frameless
FluFramelessHelper{} FluFramelessHelper{
onLoadCompleted:{
window.moveWindowToDesktopCenter()
}
}
} }
Component{ Component{
id:com_background id:com_background
@ -301,11 +306,13 @@ Window {
function moveWindowToDesktopCenter(){ function moveWindowToDesktopCenter(){
screen = Qt.application.screens[FluTools.cursorScreenIndex()] 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) window.setGeometry((Screen.width-window.width)/2+Screen.virtualX,(Screen.height-window.height)/2+Screen.virtualY,window.width,window.height)
}
function fixWindowSize(){
if(fixSize){ if(fixSize){
maximumWidth = width window.maximumWidth = window.width
maximumHeight = height window.maximumHeight = window.height
minimumWidth = width window.minimumWidth = window.width
minimumHeight = height window.minimumHeight = window.height
} }
} }
function onResult(data){ function onResult(data){

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

@ -9,7 +9,7 @@ Button {
property string contentDescription: "" property string contentDescription: ""
QtObject{ QtObject{
id:d id:d
property bool checked: rect_back.height == background.height property bool checked: (rect_back.height === background.height) && (progress === 1)
} }
property color normalColor: { property color normalColor: {
if(d.checked){ if(d.checked){

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

@ -69,6 +69,7 @@ Window {
_realHeight = height _realHeight = height
_realWidth = width _realWidth = width
moveWindowToDesktopCenter() moveWindowToDesktopCenter()
fixWindowSize()
useSystemAppBar = FluApp.useSystemAppBar useSystemAppBar = FluApp.useSystemAppBar
if(!useSystemAppBar){ if(!useSystemAppBar){
loader_frameless_helper.sourceComponent = com_frameless loader_frameless_helper.sourceComponent = com_frameless
@ -119,7 +120,11 @@ Window {
} }
Component{ Component{
id:com_frameless id:com_frameless
FluFramelessHelper{} FluFramelessHelper{
onLoadCompleted:{
window.moveWindowToDesktopCenter()
}
}
} }
Component{ Component{
id:com_background id:com_background
@ -300,11 +305,13 @@ Window {
function moveWindowToDesktopCenter(){ function moveWindowToDesktopCenter(){
screen = Qt.application.screens[FluTools.cursorScreenIndex()] 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) window.setGeometry((Screen.width-window.width)/2+Screen.virtualX,(Screen.height-window.height)/2+Screen.virtualY,window.width,window.height)
}
function fixWindowSize(){
if(fixSize){ if(fixSize){
maximumWidth = width window.maximumWidth = window.width
maximumHeight = height window.maximumHeight = window.height
minimumWidth = width window.minimumWidth = window.width
minimumHeight = height window.minimumHeight = window.height
} }
} }
function onResult(data){ function onResult(data){