Skip to content

[Windows] setAsFrameless: Enable reset to TitleBarStyle, remove resizing jitter #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lijy91 merged 3 commits into from
Mar 21, 2022
Merged

[Windows] setAsFrameless: Enable reset to TitleBarStyle, remove resizing jitter #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
266cbf4
setAsFrameless: TitleBarStyle, resizing jitter
wisetarman Mar 21, 2022
6b7ea7f
Remove window border
wisetarman Mar 21, 2022
b41d70c
Forgot to add WS_VISIBLE
wisetarman Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions windows/window_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ void WindowManager::SetAsFrameless() {
MARGINS margins = {0, 0, 0, 0};

GetWindowRect(hWnd, &rect);
SetWindowLong(hWnd, GWL_STYLE, WS_POPUP | WS_CAPTION | WS_VISIBLE);
SetWindowLong(hWnd, GWL_STYLE, WS_POPUP | WS_THICKFRAME | WS_CAPTION | WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_VISIBLE);
DwmExtendFrameIntoClientArea(hWnd, &margins);
SetWindowPos(hWnd, nullptr, rect.left, rect.top, rect.right - rect.left,
rect.bottom - rect.top,
Expand Down Expand Up @@ -564,11 +564,21 @@ void WindowManager::SetTitleBarStyle(const flutter::EncodableMap& args) {

HWND hWnd = GetMainWindow();
DWORD gwlStyle = GetWindowLong(hWnd, GWL_STYLE);
// Enables the ability to go from setAsFrameless() to TitleBarStyle.normal/hidden
is_frameless_ = false;
if (title_bar_style_ == "hidden") {
gwlStyle = gwlStyle | WS_POPUP;
gwlStyle = WS_POPUP | WS_THICKFRAME | WS_CAPTION | WS_SYSMENU | WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_VISIBLE;
SetWindowLong(hWnd, GWL_STYLE, gwlStyle);
} else {
gwlStyle = gwlStyle & ~WS_POPUP;
BOOL composition_enabled = FALSE;
bool success = DwmIsCompositionEnabled(&composition_enabled) == S_OK;
if (composition_enabled && success) {
static const MARGINS shadow_state[2]{ { 0,0,0,0 },{ 1,1,1,1 } };
DwmExtendFrameIntoClientArea(hWnd, &shadow_state[0]);
ShowWindow(hWnd, SW_SHOW);
}
}
else {
gwlStyle = WS_OVERLAPPEDWINDOW | WS_THICKFRAME | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE;
SetWindowLong(hWnd, GWL_STYLE, gwlStyle);
}

Expand Down
4 changes: 3 additions & 1 deletion windows/window_manager_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ std::optional<LRESULT> WindowManagerPlugin::HandleWindowProc(HWND hWnd,
if (message == WM_NCCALCSIZE) {
if (wParam && window_manager->is_frameless_) {
SetWindowLong(hWnd, 0, 0);
return 1;
NCCALCSIZE_PARAMS* sz = reinterpret_cast<NCCALCSIZE_PARAMS*>(lParam);
sz->rgrc[0].bottom += 1;
return (WVR_HREDRAW | WVR_VREDRAW);
}

if (wParam && window_manager->title_bar_style_ == "hidden") {
Expand Down