Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-03-01 15:40:26 +01:00
Code Releases Wiki Activity

impr: Clean up windows window code

Browse Source
This commit is contained in:
WerWolv 2024-08-03 22:18:16 +02:00
parent e9fb02285e
commit 075ece2da7
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
main/gui/source/window/win_window.cpp
View File

@ -136,6 +136,8 @@ namespace hex {
case ImGuiMouseCursor_TextInput: case ImGuiMouseCursor_TextInput:
SetCursor(LoadCursor(nullptr, IDC_IBEAM)); SetCursor(LoadCursor(nullptr, IDC_IBEAM));
break; break;
default:
break;
} }
return TRUE; return TRUE;
@ -145,7 +147,7 @@ namespace hex {
break; break;
} }
return CallWindowProc((WNDPROC)s_oldWndProc, hwnd, uMsg, wParam, lParam); return CallWindowProc(reinterpret_cast<WNDPROC>(s_oldWndProc), hwnd, uMsg, wParam, lParam);
} }
// Custom window procedure for borderless window // Custom window procedure for borderless window
@ -163,7 +165,7 @@ namespace hex {
RECT &rect = *reinterpret_cast<RECT *>(lParam); RECT &rect = *reinterpret_cast<RECT *>(lParam);
RECT client = rect; RECT client = rect;
CallWindowProc((WNDPROC)s_oldWndProc, hwnd, uMsg, wParam, lParam); CallWindowProc(reinterpret_cast<WNDPROC>(s_oldWndProc), hwnd, uMsg, wParam, lParam);
if (IsMaximized(hwnd)) { if (IsMaximized(hwnd)) {
WINDOWINFO windowInfo = { }; WINDOWINFO windowInfo = { };
@ -394,11 +396,15 @@ namespace hex {
{ {
using SetProcessDpiAwarenessContextFunc = HRESULT(WINAPI *)(DPI_AWARENESS_CONTEXT); using SetProcessDpiAwarenessContextFunc = HRESULT(WINAPI *)(DPI_AWARENESS_CONTEXT);
SetProcessDpiAwarenessContextFunc SetProcessDpiAwarenessContext = SetProcessDpiAwarenessContextFunc setProcessDpiAwarenessContext =
(SetProcessDpiAwarenessContextFunc)(void*)GetProcAddress(GetModuleHandleW(L"user32.dll"), "SetProcessDpiAwarenessContext"); reinterpret_cast<SetProcessDpiAwarenessContextFunc>(
reinterpret_cast<void*>(
GetProcAddress(GetModuleHandleW(L"user32.dll"), "SetProcessDpiAwarenessContext")
)
);
if (SetProcessDpiAwarenessContext != nullptr) { if (setProcessDpiAwarenessContext != nullptr) {
SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2); setProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
} }
} }
@ -537,7 +543,7 @@ namespace hex {
// Set up the correct window procedure based on the borderless window mode state // Set up the correct window procedure based on the borderless window mode state
if (borderlessWindowMode) { if (borderlessWindowMode) {
s_oldWndProc = ::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)borderlessWindowProc); s_oldWndProc = ::SetWindowLongPtr(hwnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(borderlessWindowProc));
MARGINS borderless = { 1, 1, 1, 1 }; MARGINS borderless = { 1, 1, 1, 1 };
::DwmExtendFrameIntoClientArea(hwnd, &borderless); ::DwmExtendFrameIntoClientArea(hwnd, &borderless);
@ -547,7 +553,7 @@ namespace hex {
::SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE); ::SetWindowPos(hwnd, nullptr, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOMOVE);
} else { } else {
s_oldWndProc = ::SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)commonWindowProc); s_oldWndProc = ::SetWindowLongPtr(hwnd, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(commonWindowProc));
} }
// Set up a taskbar progress handler // Set up a taskbar progress handler
@ -606,25 +612,25 @@ namespace hex {
if (user32Dll != nullptr) { if (user32Dll != nullptr) {
using SetWindowCompositionAttributeFunc = BOOL(WINAPI*)(HWND, WINCOMPATTRDATA*); using SetWindowCompositionAttributeFunc = BOOL(WINAPI*)(HWND, WINCOMPATTRDATA*);
const auto SetWindowCompositionAttribute = const auto setWindowCompositionAttribute =
(SetWindowCompositionAttributeFunc) reinterpret_cast<SetWindowCompositionAttributeFunc>(
(void*) reinterpret_cast<void*>(
GetProcAddress(user32Dll.get(), "SetWindowCompositionAttribute"); GetProcAddress(user32Dll.get(), "SetWindowCompositionAttribute")
)
);
if (SetWindowCompositionAttribute != nullptr) { if (setWindowCompositionAttribute != nullptr) {
ACCENTPOLICY policy = { ImGuiExt::GetCustomStyle().WindowBlur > 0.5F ? 4U : 0U, 0, ImGuiExt::GetCustomColorU32(ImGuiCustomCol_BlurBackground), 0 }; ACCENTPOLICY policy = { ImGuiExt::GetCustomStyle().WindowBlur > 0.5F ? 4U : 0U, 0, ImGuiExt::GetCustomColorU32(ImGuiCustomCol_BlurBackground), 0 };
WINCOMPATTRDATA data = { 19, &policy, sizeof(ACCENTPOLICY) }; WINCOMPATTRDATA data = { 19, &policy, sizeof(ACCENTPOLICY) };
SetWindowCompositionAttribute(hwnd, &data); setWindowCompositionAttribute(hwnd, &data);
} }
} }
}); });
RequestChangeTheme::subscribe([this](const std::string &theme) { RequestChangeTheme::subscribe([this](const std::string &theme) {
const int immersiveDarkMode = 20;
auto hwnd = glfwGetWin32Window(m_window); auto hwnd = glfwGetWin32Window(m_window);
BOOL value = theme == "Dark" ? TRUE : FALSE;
// Using the C++ "bool" type seems to not work correctly. BOOL value = theme == "Dark" ? TRUE : FALSE;
DwmSetWindowAttribute(hwnd, immersiveDarkMode, &value, sizeof(value)); DwmSetWindowAttribute(hwnd, DWMWA_USE_IMMERSIVE_DARK_MODE, &value, sizeof(value));
}); });
ImGui::GetIO().ConfigDebugIsDebuggerPresent = ::IsDebuggerPresent(); ImGui::GetIO().ConfigDebugIsDebuggerPresent = ::IsDebuggerPresent();