Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-18 17:14:13 +01:00
Code Releases Wiki Activity

fix: Window title bar not looking correct on Windows

Browse Source
This commit is contained in:
WerWolv 2024-02-04 13:55:15 +01:00
parent a6f4d0cdec
commit f60986de8e
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/builtin/source/content/window_decoration.cpp
View File

@ -132,11 +132,19 @@ namespace hex::plugin::builtin {
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImGui::GetColorU32(ImGuiCol_ScrollbarGrabActive)); ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImGui::GetColorU32(ImGuiCol_ScrollbarGrabActive));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetColorU32(ImGuiCol_ScrollbarGrabHovered)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImGui::GetColorU32(ImGuiCol_ScrollbarGrabHovered));
auto framePadding = ImGui::GetStyle().FramePadding * 2;
const auto windowSize = ImHexApi::System::getMainWindowSize(); const auto windowSize = ImHexApi::System::getMainWindowSize();
const auto searchBoxSize = ImVec2(windowSize.x / 2.5, titleBarHeight); auto searchBoxSize = ImVec2(windowSize.x / 2.5, titleBarHeight);
const auto searchBoxPos = ImVec2((windowSize / 2 - searchBoxSize / 2).x, framePadding.y); auto searchBoxPos = ImVec2((windowSize / 2 - searchBoxSize / 2).x, 0);
auto titleBarButtonPosY = 0.0F;
#if defined(OS_MACOS)
searchBoxPos.y = ImGui::GetStyle().FramePadding.y * 2;
titleBarButtonPosY = searchBoxPos.y;
#else
titleBarButtonPosY = 0;
searchBoxPos.y = 3_scaled;
searchBoxSize.y -= 3_scaled;
#endif
s_searchBarPosition = searchBoxPos.x; s_searchBarPosition = searchBoxPos.x;
@ -180,7 +188,7 @@ namespace hex::plugin::builtin {
if (ImGui::GetCursorPosX() > (searchBoxPos.x + searchBoxSize.x)) { if (ImGui::GetCursorPosX() > (searchBoxPos.x + searchBoxSize.x)) {
for (const auto &[icon, tooltip, callback] : titleBarButtons) { for (const auto &[icon, tooltip, callback] : titleBarButtons) {
ImGui::SetCursorPosY(framePadding.y); ImGui::SetCursorPosY(titleBarButtonPosY);
if (ImGuiExt::TitleBarButton(icon.c_str(), buttonSize)) { if (ImGuiExt::TitleBarButton(icon.c_str(), buttonSize)) {
callback(); callback();
} }
@ -312,8 +320,6 @@ namespace hex::plugin::builtin {
} else { } else {
ImGui::PopStyleVar(); ImGui::PopStyleVar();
} }
ImGui::PopStyleVar();
} }
void drawToolbar() { void drawToolbar() {