Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Fix restoring window after minimized

This commit is contained in:
WerWolv 2021-08-25 19:32:47 +02:00
parent c053d54d10
commit 48b5262855
1 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
source/window/win_window.cpp
View File

@ -3,44 +3,65 @@
#if defined(OS_WINDOWS) #if defined(OS_WINDOWS)
#include <imgui.h> #include <imgui.h>
#include <imgui_internal.h>
#include <codicons_font.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#define GLFW_EXPOSE_NATIVE_WIN32 #define GLFW_EXPOSE_NATIVE_WIN32
#include <GLFW/glfw3native.h> #include <GLFW/glfw3native.h>
#undef GLFW_EXPOSE_NATIVE_WIN32
#include <winuser.h> #include <winuser.h>
#include <dwmapi.h> #include <dwmapi.h>
#include <windowsx.h> #include <windowsx.h>
#include <imgui_internal.h>
#include <codicons_font.h>
namespace hex { namespace hex {
static LONG_PTR oldWndProc; static LONG_PTR oldWndProc;
static float titleBarHeight; static float titleBarHeight;
static ImGuiMouseCursor mouseCursorIcon; static ImGuiMouseCursor mouseCursorIcon;
static float borderScaling; static float borderScaling;
LRESULT wndProcImHex(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { static bool isTaskbarAutoHideEnabled(UINT edge, RECT monitor) {
switch (uMsg) { APPBARDATA data = { .cbSize = sizeof(APPBARDATA), .uEdge = edge, .rc = monitor };
case WM_NCCALCSIZE: { return ::SHAppBarMessage(ABM_GETAUTOHIDEBAR, &data);
auto& params = *reinterpret_cast<NCCALCSIZE_PARAMS*>(lParam);
RECT &rect = params.rgrc[0];
WINDOWPLACEMENT placement;
if (!::GetWindowPlacement(hwnd, &placement) || placement.showCmd != SW_MAXIMIZE)
return 0;
auto monitor = ::MonitorFromWindow(hwnd, MONITOR_DEFAULTTONULL);
if (monitor == nullptr) {
return 0;
} }
MONITORINFO monitor_info{}; static LRESULT windowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {
monitor_info.cbSize = sizeof(monitor_info); switch (uMsg) {
if (!::GetMonitorInfoW(monitor, &monitor_info)) case WM_NCCALCSIZE: {
return 0; RECT &rect = *reinterpret_cast<RECT*>(lParam);
RECT client = rect;
rect = monitor_info.rcWork; DefWindowProcW(hwnd, WM_NCCALCSIZE, wParam, lParam);
if (IsMaximized(hwnd)) {
WINDOWINFO windowInfo = { .cbSize = sizeof(WINDOWINFO) };
GetWindowInfo(hwnd, &windowInfo);
rect = RECT {
.left = static_cast<LONG>(client.left + windowInfo.cyWindowBorders),
.top = static_cast<LONG>(client.top + windowInfo.cyWindowBorders),
.right = static_cast<LONG>(client.right - windowInfo.cyWindowBorders),
.bottom = static_cast<LONG>(client.bottom - windowInfo.cyWindowBorders)
};
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;
}
return 0; return 0;
} }
@ -112,11 +133,13 @@
case RegionBottom | RegionRight: case RegionBottom | RegionRight:
return HTBOTTOMRIGHT; return HTBOTTOMRIGHT;
case RegionClient: case RegionClient:
default:
if ((cursor.y < (window.top + titleBarHeight * 2)) && !ImGui::IsAnyItemHovered()) if ((cursor.y < (window.top + titleBarHeight * 2)) && !ImGui::IsAnyItemHovered())
return HTCAPTION; return HTCAPTION;
else break; else break;
} }
} }
default: break;
} }
return CallWindowProc((WNDPROC)oldWndProc, hwnd, uMsg, wParam, lParam); return CallWindowProc((WNDPROC)oldWndProc, hwnd, uMsg, wParam, lParam);
@ -140,7 +163,7 @@
void Window::setupNativeWindow() { void Window::setupNativeWindow() {
auto hwnd = glfwGetWin32Window(this->m_window); auto hwnd = glfwGetWin32Window(this->m_window);
oldWndProc = ::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)wndProcImHex); oldWndProc = ::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)windowProc);
MARGINS borderless = {1,1,1,1}; MARGINS borderless = {1,1,1,1};
::DwmExtendFrameIntoClientArea(hwnd, &borderless); ::DwmExtendFrameIntoClientArea(hwnd, &borderless);