kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Use native system window menu with custom titlebar on Windows

Browse source
This commit is contained in:
Ilya Fedin 2022-05-22 22:28:24 +04:00 • committed by John Preston
parent 2e9aec239d
commit 3255de2e5a
3 changed files with 3 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/platform/win/ui_utility_win.cpp
View file

@ -126,8 +126,8 @@ bool ShowWindowMenu(QWindow *window) {
SendMessage( SendMessage(
HWND(window->winId()), HWND(window->winId()),
WM_SYSCOMMAND, 0x313 /* WM_POPUPSYSTEMMENU */,
SC_MOUSEMENU, 0,
MAKELPARAM(pos.x(), pos.y())); MAKELPARAM(pos.x(), pos.y()));
return true; return true;

88
ui/platform/win/ui_window_win.cpp
View file

@ -399,11 +399,7 @@ void WindowHelper::init() {
updateWindowFrameColors(); updateWindowFrameColors();
_menu = GetSystemMenu(_handle, FALSE);
updateSystemMenu();
const auto handleStateChanged = [=](Qt::WindowState state) { const auto handleStateChanged = [=](Qt::WindowState state) {
updateSystemMenu(state);
if (fixedSize() && (state & Qt::WindowMaximized)) { if (fixedSize() && (state & Qt::WindowMaximized)) {
crl::on_main(window().get(), [=] { crl::on_main(window().get(), [=] {
window()->setWindowState( window()->setWindowState(
@ -507,7 +503,7 @@ bool WindowHelper::handleNativeEvent(
if (_title->isHidden()) { if (_title->isHidden()) {
return false; return false;
} }
SendMessage(_handle, WM_SYSCOMMAND, SC_MOUSEMENU, lParam); SendMessage(_handle, 0x313 /* WM_POPUPSYSTEMMENU */, 0, lParam);
if (result) *result = 0; if (result) *result = 0;
} return true; } return true;
@ -650,45 +646,6 @@ bool WindowHelper::handleNativeEvent(
_systemButtonOver.fire(systemButtonHitTest(*result)); _systemButtonOver.fire(systemButtonHitTest(*result));
} return true; } return true;
case WM_SYSCOMMAND: {
if (wParam == SC_MOUSEMENU && !fixedSize()) {
POINTS p = MAKEPOINTS(lParam);
updateSystemMenu(window()->windowHandle()->windowState());
TrackPopupMenu(
_menu,
TPM_LEFTALIGN | TPM_TOPALIGN | TPM_LEFTBUTTON,
p.x,
p.y,
0,
_handle,
0);
}
} return false;
case WM_COMMAND: {
if (HIWORD(wParam)) {
return false;
}
const auto command = LOWORD(wParam);
switch (command) {
case SC_CLOSE:
window()->close();
return true;
case SC_MINIMIZE:
window()->setWindowState(
window()->windowState() | Qt::WindowMinimized);
return true;
case SC_MAXIMIZE:
if (!fixedSize()) {
window()->setWindowState(Qt::WindowMaximized);
}
return true;
case SC_RESTORE:
window()->setWindowState(Qt::WindowNoState);
return true;
}
} return true;
// should return true for Qt not to change window size // should return true for Qt not to change window size
// when moving the window between screens // when moving the window between screens
// change to false once runtime scale change would be supported // change to false once runtime scale change would be supported
@ -817,49 +774,6 @@ void WindowHelper::updateWindowFrameColors(bool active) {
sizeof(COLORREF)); sizeof(COLORREF));
} }
void WindowHelper::updateSystemMenu() {
updateSystemMenu(window()->windowHandle()->windowState());
}
void WindowHelper::updateSystemMenu(Qt::WindowState state) {
if (!_menu) {
return;
}
const auto menuToDisable = (state == Qt::WindowMaximized)
? SC_MAXIMIZE
: (state == Qt::WindowMinimized)
? SC_MINIMIZE
: SC_RESTORE;
const auto itemCount = GetMenuItemCount(_menu);
for (int i = 0; i < itemCount; ++i) {
MENUITEMINFO itemInfo = { 0 };
itemInfo.cbSize = sizeof(itemInfo);
itemInfo.fMask = MIIM_TYPE | MIIM_STATE | MIIM_ID;
if (!GetMenuItemInfo(_menu, i, TRUE, &itemInfo)) {
break;
}
if (itemInfo.fType & MFT_SEPARATOR) {
continue;
} else if (!itemInfo.wID || itemInfo.wID == SC_CLOSE) {
continue;
}
UINT fOldState = itemInfo.fState;
UINT fState = itemInfo.fState & ~(MFS_DISABLED | MFS_DEFAULT);
if (itemInfo.wID == menuToDisable
|| (itemInfo.wID != SC_MINIMIZE
&& itemInfo.wID != SC_MAXIMIZE
&& itemInfo.wID != SC_RESTORE)) {
fState |= MFS_DISABLED;
}
itemInfo.fMask = MIIM_STATE;
itemInfo.fState = fState;
if (!SetMenuItemInfo(_menu, i, TRUE, &itemInfo)) {
break;
}
}
}
not_null<WindowHelper::NativeFilter*> WindowHelper::GetNativeFilter() { not_null<WindowHelper::NativeFilter*> WindowHelper::GetNativeFilter() {
Expects(QCoreApplication::instance() != nullptr); Expects(QCoreApplication::instance() != nullptr);

3
ui/platform/win/ui_window_win.h
View file

@ -51,8 +51,6 @@ private:
void init(); void init();
void updateWindowFrameColors(); void updateWindowFrameColors();
void updateWindowFrameColors(bool active); void updateWindowFrameColors(bool active);
void updateSystemMenu();
void updateSystemMenu(Qt::WindowState state);
void initialShadowUpdate(); void initialShadowUpdate();
void updateCornersRounding(); void updateCornersRounding();
[[nodiscard]] bool handleNativeEvent( [[nodiscard]] bool handleNativeEvent(
@ -80,7 +78,6 @@ private:
rpl::event_stream<HitTestResult> _systemButtonDown; rpl::event_stream<HitTestResult> _systemButtonDown;
std::optional<WindowShadow> _shadow; std::optional<WindowShadow> _shadow;
rpl::variable<uint> _dpi; rpl::variable<uint> _dpi;
HMENU _menu = nullptr;
bool _isFullScreen = false; bool _isFullScreen = false;
}; };