kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Fix window frame glitches on Windows 7.

Browse source
This commit is contained in:
John Preston 2021-08-10 15:04:30 +03:00
parent 5c0066958b
commit 024f6fc1a9
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,6 +101,24 @@ HRESULT WinApiSetWindowTheme(
return method ? method(hWnd, pszSubAppName, pszSubIdList) : HRESULT(); return method ? method(hWnd, pszSubAppName, pszSubIdList) : HRESULT();
} }
void FixAeroSnap(HWND handle) {
SetWindowLongPtr(
handle,
GWL_STYLE,
GetWindowLongPtr(handle, GWL_STYLE) | WS_CAPTION | WS_THICKFRAME);
}
[[nodiscard]] HWND ResolveWindowHandle(not_null<QWidget*> widget) {
if (!::Platform::IsWindows8OrGreater()) {
widget->setWindowFlag(Qt::FramelessWindowHint);
}
const auto result = GetWindowHandle(widget);
if (!::Platform::IsWindows8OrGreater()) {
FixAeroSnap(result);
}
return result;
}
} // namespace } // namespace
class WindowHelper::NativeFilter final : public QAbstractNativeEventFilter { class WindowHelper::NativeFilter final : public QAbstractNativeEventFilter {
@ -145,7 +163,7 @@ bool WindowHelper::NativeFilter::nativeEventFilter(
WindowHelper::WindowHelper(not_null<RpWidget*> window) WindowHelper::WindowHelper(not_null<RpWidget*> window)
: BasicWindowHelper(window) : BasicWindowHelper(window)
, _handle(GetWindowHandle(window)) , _handle(ResolveWindowHandle(window))
, _title(Ui::CreateChild<TitleWidget>(window.get())) , _title(Ui::CreateChild<TitleWidget>(window.get()))
, _body(Ui::CreateChild<RpWidget>(window.get())) , _body(Ui::CreateChild<RpWidget>(window.get()))
, _shadow(std::in_place, window, st::windowShadowFg->c) { , _shadow(std::in_place, window, st::windowShadowFg->c) {
@ -172,6 +190,12 @@ void WindowHelper::setTitleStyle(const style::WindowTitle &st) {
} }
void WindowHelper::setNativeFrame(bool enabled) { void WindowHelper::setNativeFrame(bool enabled) {
if (!::Platform::IsWindows8OrGreater()) {
window()->windowHandle()->setFlag(Qt::FramelessWindowHint, !enabled);
if (!enabled) {
FixAeroSnap(_handle);
}
}
_title->setVisible(!enabled); _title->setVisible(!enabled);
if (enabled) { if (enabled) {
_shadow.reset(); _shadow.reset();