diff --git a/source/window/win_window.cpp b/source/window/win_window.cpp index 35e7d9c50..0c62f4104 100644 --- a/source/window/win_window.cpp +++ b/source/window/win_window.cpp @@ -28,11 +28,6 @@ static ImGuiMouseCursor mouseCursorIcon; static BOOL compositionEnabled = false; - static bool isTaskbarAutoHideEnabled(UINT edge, RECT monitor) { - APPBARDATA data = { .cbSize = sizeof(APPBARDATA), .uEdge = edge, .rc = monitor }; - return ::SHAppBarMessage(ABM_GETAUTOHIDEBAR, &data); - } - static LRESULT windowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { case WM_NCCALCSIZE: { @@ -48,23 +43,8 @@ .left = static_cast(client.left + windowInfo.cyWindowBorders), .top = static_cast(client.top + windowInfo.cyWindowBorders), .right = static_cast(client.right - windowInfo.cyWindowBorders), - .bottom = static_cast(client.bottom - windowInfo.cyWindowBorders) + .bottom = static_cast(client.bottom - windowInfo.cyWindowBorders) + 1 }; - - HMONITOR hMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTOPRIMARY); - MONITORINFO monitorInfo = { .cbSize = sizeof(MONITORINFO) }; - GetMonitorInfoW(hMonitor, &monitorInfo); - - if (EqualRect(&rect, &monitorInfo.rcMonitor)) { - if (isTaskbarAutoHideEnabled(ABE_BOTTOM, monitorInfo.rcMonitor)) - rect.bottom--; - else if (isTaskbarAutoHideEnabled(ABE_LEFT, monitorInfo.rcMonitor)) - rect.left++; - else if (isTaskbarAutoHideEnabled(ABE_TOP, monitorInfo.rcMonitor)) - rect.top++; - else if (isTaskbarAutoHideEnabled(ABE_RIGHT, monitorInfo.rcMonitor)) - rect.right--; - } } else { rect = client; } @@ -157,11 +137,6 @@ break; } - case WM_NCACTIVATE: - case WM_NCPAINT: - { - return DefWindowProc(hwnd, uMsg, wParam, lParam); - } default: break; }