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

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

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