Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-24 15:50:16 +01:00
Code Releases Wiki Activity

fix: Draw title bar correctly when no title bar buttons exist

Browse Source
This commit is contained in:
Justus Garbe 2023-08-13 23:54:22 +02:00
parent 2059ad82c3
commit 33e9ad7775
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main/source/window/window.cpp
View File

@ -258,12 +258,14 @@ namespace hex {
auto &titleBarButtons = ContentRegistry::Interface::impl::getTitleBarButtons(); auto &titleBarButtons = ContentRegistry::Interface::impl::getTitleBarButtons();
// Draw custom title bar buttons // Draw custom title bar buttons
ImGui::SetCursorPosX(ImGui::GetWindowWidth() - buttonSize.x * (4 + titleBarButtons.size())); if(!titleBarButtons.empty()) {
for (const auto &[icon, tooltip, callback] : titleBarButtons) { ImGui::SetCursorPosX(ImGui::GetWindowWidth() - buttonSize.x * (4 + titleBarButtons.size()));
if (ImGui::TitleBarButton(icon.c_str(), buttonSize)) { for (const auto &[icon, tooltip, callback]: titleBarButtons) {
callback(); if (ImGui::TitleBarButton(icon.c_str(), buttonSize)) {
callback();
}
ImGui::InfoTooltip(LangEntry(tooltip));
} }
ImGui::InfoTooltip(LangEntry(tooltip));
} }
// Draw minimize, restore and maximize buttons // Draw minimize, restore and maximize buttons
@ -306,12 +308,14 @@ namespace hex {
auto &titleBarButtons = ContentRegistry::Interface::impl::getTitleBarButtons(); auto &titleBarButtons = ContentRegistry::Interface::impl::getTitleBarButtons();
// Draw custom title bar buttons // Draw custom title bar buttons
ImGui::SetCursorPosX(ImGui::GetWindowWidth() - buttonSize.x * (titleBarButtons.size()+0.5)); if(!titleBarButtons.empty()) {
for (const auto &[icon, tooltip, callback] : titleBarButtons) { ImGui::SetCursorPosX(ImGui::GetWindowWidth() - buttonSize.x * (titleBarButtons.size() + 0.5));
if (ImGui::TitleBarButton(icon.c_str(), buttonSize)) { for (const auto &[icon, tooltip, callback]: titleBarButtons) {
callback(); if (ImGui::TitleBarButton(icon.c_str(), buttonSize)) {
callback();
}
ImGui::InfoTooltip(LangEntry(tooltip));
} }
ImGui::InfoTooltip(LangEntry(tooltip));
} }
ImGui::PopStyleColor(3); ImGui::PopStyleColor(3);