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

fix window resolution

This commit is contained in:
Nomango 2020-06-24 17:33:27 +08:00
parent 922a9757c0
commit aee8435322
2 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/kiwano/platform/Window.h
View File

@ -51,9 +51,9 @@ enum class CursorType
*/ */
struct Resolution struct Resolution
{ {
uint32_t width; ///< 分辨率宽度 uint32_t width = 0; ///< 分辨率宽度
uint32_t height; ///< 分辨率高度 uint32_t height = 0; ///< 分辨率高度
uint32_t refresh_rate; ///< 刷新率 uint32_t refresh_rate = 0; ///< 刷新率
}; };
/** /**

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

@ -249,28 +249,27 @@ void WindowWin32Impl::Init(const WindowConfig& config)
HMONITOR monitor = ::MonitorFromPoint(POINT{ 0, 0 }, MONITOR_DEFAULTTOPRIMARY); HMONITOR monitor = ::MonitorFromPoint(POINT{ 0, 0 }, MONITOR_DEFAULTTOPRIMARY);
// Get the target monitor info // Get the target monitor info
MONITORINFOEXA monitor_info_ex; MONITORINFOEXA monitor_info;
memset(&monitor_info_ex, 0, sizeof(MONITORINFOEXA)); memset(&monitor_info, 0, sizeof(MONITORINFOEXA));
monitor_info_ex.cbSize = sizeof(MONITORINFOEXA); monitor_info.cbSize = sizeof(MONITORINFOEXA);
::GetMonitorInfoA(monitor, &monitor_info_ex); ::GetMonitorInfoA(monitor, &monitor_info);
// Save the device name // Save the device name
device_name_ = monitor_info_ex.szDevice; device_name_ = monitor_info.szDevice;
uint32_t screenw = monitor_info_ex.rcWork.right - monitor_info_ex.rcWork.left; uint32_t screenw = monitor_info.rcWork.right - monitor_info.rcWork.left;
uint32_t screenh = monitor_info_ex.rcWork.bottom - monitor_info_ex.rcWork.top; uint32_t screenh = monitor_info.rcWork.bottom - monitor_info.rcWork.top;
uint32_t win_width, win_height; uint32_t win_width, win_height;
AdjustWindow(config.width, config.height, GetStyle(), &win_width, &win_height); AdjustWindow(config.width, config.height, GetStyle(), &win_width, &win_height);
int left = monitor_info_ex.rcWork.left + (screenw - win_width) / 2; int left = monitor_info.rcWork.left + (screenw - win_width) / 2;
int top = monitor_info_ex.rcWork.top + (screenh - win_height) / 2; int top = monitor_info.rcWork.top + (screenh - win_height) / 2;
width_ = win_width; width_ = win_width;
height_ = win_height; height_ = win_height;
resizable_ = config.resizable; resizable_ = config.resizable;
is_fullscreen_ = config.fullscreen; is_fullscreen_ = config.fullscreen;
resolution_ = Resolution{ width_, height_, 0 };
handle_ = ::CreateWindowExA(0, "KiwanoAppWnd", config.title.c_str(), GetStyle(), left, top, width_, height_, handle_ = ::CreateWindowExA(0, "KiwanoAppWnd", config.title.c_str(), GetStyle(), left, top, width_, height_,
nullptr, nullptr, hinst, nullptr); nullptr, nullptr, hinst, nullptr);
@ -293,6 +292,7 @@ void WindowWin32Impl::Init(const WindowConfig& config)
if (is_fullscreen_) if (is_fullscreen_)
{ {
MONITORINFOEXA info = GetMoniterInfoEx(handle_); MONITORINFOEXA info = GetMoniterInfoEx(handle_);
int x = (int)info.rcMonitor.left; int x = (int)info.rcMonitor.left;
int y = (int)info.rcMonitor.top; int y = (int)info.rcMonitor.top;
int cx = (int)(info.rcMonitor.right - info.rcMonitor.left); int cx = (int)(info.rcMonitor.right - info.rcMonitor.left);
@ -301,6 +301,16 @@ void WindowWin32Impl::Init(const WindowConfig& config)
// Top the window // Top the window
::SetWindowPos(handle_, HWND_TOPMOST, x, y, cx, cy, SWP_NOACTIVATE); ::SetWindowPos(handle_, HWND_TOPMOST, x, y, cx, cy, SWP_NOACTIVATE);
::ShowWindow(handle_, SW_SHOWNORMAL); ::ShowWindow(handle_, SW_SHOWNORMAL);
resolution_.width = config.width;
resolution_.height = config.height;
}
else
{
RECT client_area;
::GetClientRect(handle_, &client_area);
resolution_.width = uint32_t(client_area.right - client_area.left);
resolution_.height = uint32_t(client_area.bottom - client_area.top);
} }
} }