Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[deploy] fix: incorrect window minimum & maximum size

This commit is contained in:
Nomango 2020-10-16 00:34:04 +08:00
parent 18a0fd5e55
commit 4ee5653422
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/kiwano/platform/win32/WindowImpl.cpp
View File

@ -340,14 +340,12 @@ void WindowWin32Impl::SetIcon(Icon icon)
void WindowWin32Impl::SetMinimumSize(uint32_t width, uint32_t height) void WindowWin32Impl::SetMinimumSize(uint32_t width, uint32_t height)
{ {
min_width_ = width; AdjustWindow(width, height, GetStyle(), &min_width_, &min_height_);
min_height_ = height;
} }
void WindowWin32Impl::SetMaximumSize(uint32_t width, uint32_t height) void WindowWin32Impl::SetMaximumSize(uint32_t width, uint32_t height)
{ {
max_width_ = width; AdjustWindow(width, height, GetStyle(), &max_width_, &max_height_);
max_height_ = height;
} }
void WindowWin32Impl::SetCursor(CursorType cursor) void WindowWin32Impl::SetCursor(CursorType cursor)
@ -716,13 +714,14 @@ LRESULT WindowWin32Impl::MessageProc(HWND hwnd, UINT32 msg, WPARAM wparam, LPARA
case WM_GETMINMAXINFO: case WM_GETMINMAXINFO:
{ {
if (min_width_ || min_height_) if (min_width_ && min_height_)
{ {
((MINMAXINFO*)lparam)->ptMinTrackSize = POINT{ LONG(min_width_), LONG(min_height_) }; ((MINMAXINFO*)lparam)->ptMinTrackSize = POINT{ LONG(min_width_), LONG(min_height_) };
} }
if (max_width_ || max_height_) if (max_width_ && max_height_)
{ {
((MINMAXINFO*)lparam)->ptMaxTrackSize = POINT{ LONG(max_width_), LONG(max_height_) }; ((MINMAXINFO*)lparam)->ptMaxTrackSize = POINT{ LONG(max_width_), LONG(max_height_) };
((MINMAXINFO*)lparam)->ptMaxSize = POINT{ LONG(max_width_), LONG(max_height_) };
} }
return 0; return 0;
} }