Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-26 16:23:44 +01:00
Code Releases Wiki Activity

impr: Properly align favorite icons inside of the buttons in the pattern drawer

Browse Source
This commit is contained in:
WerWolv 2024-12-29 20:38:25 +01:00
parent 40ec7195d1
commit ba96d86dc2
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libimhex/include/hex/ui/imgui_imhex_extensions.h
View File

@ -144,7 +144,7 @@ namespace ImGuiExt {
bool TitleBarButton(const char *label, ImVec2 size_arg); bool TitleBarButton(const char *label, ImVec2 size_arg);
bool ToolBarButton(const char *symbol, ImVec4 color); bool ToolBarButton(const char *symbol, ImVec4 color);
bool IconButton(const char *symbol, ImVec4 color, ImVec2 size_arg = ImVec2(0, 0)); bool IconButton(const char *symbol, ImVec4 color, ImVec2 size_arg = ImVec2(0, 0), ImVec2 iconOffset = ImVec2(0, 0));
bool InputIntegerPrefix(const char* label, const char *prefix, void *value, ImGuiDataType type, const char *format, ImGuiInputTextFlags flags = ImGuiInputTextFlags_None); bool InputIntegerPrefix(const char* label, const char *prefix, void *value, ImGuiDataType type, const char *format, ImGuiInputTextFlags flags = ImGuiInputTextFlags_None);
bool InputHexadecimal(const char* label, u32 *value, ImGuiInputTextFlags flags = ImGuiInputTextFlags_None); bool InputHexadecimal(const char* label, u32 *value, ImGuiInputTextFlags flags = ImGuiInputTextFlags_None);
@ -291,8 +291,8 @@ namespace ImGuiExt {
bool BitCheckbox(const char* label, bool* v); bool BitCheckbox(const char* label, bool* v);
bool DimmedButton(const char* label, ImVec2 size = ImVec2(0, 0)); bool DimmedButton(const char* label, ImVec2 size = ImVec2(0, 0));
bool DimmedIconButton(const char *symbol, ImVec4 color, ImVec2 size = ImVec2(0, 0)); bool DimmedIconButton(const char *symbol, ImVec4 color, ImVec2 size = ImVec2(0, 0), ImVec2 iconOffset = ImVec2(0, 0));
bool DimmedButtonToggle(const char *icon, bool *v, ImVec2 size); bool DimmedButtonToggle(const char *icon, bool *v, ImVec2 size = ImVec2(0, 0), ImVec2 iconOffset = ImVec2(0, 0));
bool DimmedIconToggle(const char *icon, bool *v); bool DimmedIconToggle(const char *icon, bool *v);
bool DimmedIconToggle(const char *iconOn, const char *iconOff, bool *v); bool DimmedIconToggle(const char *iconOn, const char *iconOff, bool *v);

12
lib/libimhex/source/ui/imgui_imhex_extensions.cpp
View File

@ -824,7 +824,7 @@ namespace ImGuiExt {
return pressed; return pressed;
} }
bool IconButton(const char *symbol, ImVec4 color, ImVec2 size_arg) { bool IconButton(const char *symbol, ImVec4 color, ImVec2 size_arg, ImVec2 iconOffset) {
ImGuiWindow *window = GetCurrentWindow(); ImGuiWindow *window = GetCurrentWindow();
if (window->SkipItems) if (window->SkipItems)
return false; return false;
@ -855,7 +855,7 @@ namespace ImGuiExt {
: ImGuiCol_Button); : ImGuiCol_Button);
RenderNavCursor(bb, id); RenderNavCursor(bb, id);
RenderFrame(bb.Min, bb.Max, col, true, style.FrameRounding); RenderFrame(bb.Min, bb.Max, col, true, style.FrameRounding);
RenderTextClipped(bb.Min + style.FramePadding * ImVec2(1.3, 1), bb.Max - style.FramePadding, symbol, nullptr, &label_size, style.ButtonTextAlign, &bb); RenderTextClipped(bb.Min + style.FramePadding * ImVec2(1.3, 1) + iconOffset, bb.Max - style.FramePadding, symbol, nullptr, &label_size, style.ButtonTextAlign, &bb);
PopStyleColor(); PopStyleColor();
@ -1101,14 +1101,14 @@ namespace ImGuiExt {
return res; return res;
} }
bool DimmedIconButton(const char *symbol, ImVec4 color, ImVec2 size){ bool DimmedIconButton(const char *symbol, ImVec4 color, ImVec2 size, ImVec2 iconOffset) {
PushStyleColor(ImGuiCol_ButtonHovered, GetCustomColorU32(ImGuiCustomCol_DescButtonHovered)); PushStyleColor(ImGuiCol_ButtonHovered, GetCustomColorU32(ImGuiCustomCol_DescButtonHovered));
PushStyleColor(ImGuiCol_Button, GetCustomColorU32(ImGuiCustomCol_DescButton)); PushStyleColor(ImGuiCol_Button, GetCustomColorU32(ImGuiCustomCol_DescButton));
PushStyleColor(ImGuiCol_Text, GetColorU32(ImGuiCol_ButtonActive)); PushStyleColor(ImGuiCol_Text, GetColorU32(ImGuiCol_ButtonActive));
PushStyleColor(ImGuiCol_ButtonActive, GetCustomColorU32(ImGuiCustomCol_DescButtonActive)); PushStyleColor(ImGuiCol_ButtonActive, GetCustomColorU32(ImGuiCustomCol_DescButtonActive));
PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1); PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1);
bool res = IconButton(symbol, color, size); bool res = IconButton(symbol, color, size, iconOffset);
PopStyleColor(4); PopStyleColor(4);
PopStyleVar(1); PopStyleVar(1);
@ -1116,7 +1116,7 @@ namespace ImGuiExt {
return res; return res;
} }
bool DimmedButtonToggle(const char *icon, bool *v, ImVec2 size) { bool DimmedButtonToggle(const char *icon, bool *v, ImVec2 size, ImVec2 iconOffset) {
bool pushed = false; bool pushed = false;
bool toggled = false; bool toggled = false;
@ -1125,7 +1125,7 @@ namespace ImGuiExt {
pushed = true; pushed = true;
} }
if (DimmedIconButton(icon, GetStyleColorVec4(ImGuiCol_Text), size)) { if (DimmedIconButton(icon, GetStyleColorVec4(ImGuiCol_Text), size, iconOffset)) {
*v = !*v; *v = !*v;
toggled = true; toggled = true;
} }

4
plugins/ui/source/ui/pattern_drawer.cpp
View File

@ -302,12 +302,12 @@ namespace hex::ui {
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
if (m_favorites.contains(m_currPatternPath)) { if (m_favorites.contains(m_currPatternPath)) {
if (ImGuiExt::DimmedIconButton(ICON_VS_STAR_DELETE, ImGui::GetStyleColorVec4(ImGuiCol_PlotHistogram))) { if (ImGuiExt::DimmedIconButton(ICON_VS_STAR_DELETE, ImGui::GetStyleColorVec4(ImGuiCol_PlotHistogram), {}, { 1_scaled, 0 })) {
m_favorites.erase(m_currPatternPath); m_favorites.erase(m_currPatternPath);
} }
} }
else { else {
if (ImGuiExt::DimmedIconButton(ICON_VS_STAR_ADD, ImGui::GetStyleColorVec4(ImGuiCol_TextDisabled))) { if (ImGuiExt::DimmedIconButton(ICON_VS_STAR_ADD, ImGui::GetStyleColorVec4(ImGuiCol_TextDisabled), {}, { 1_scaled, 0 })) {
m_favorites.insert({ m_currPatternPath, pattern.clone() }); m_favorites.insert({ m_currPatternPath, pattern.clone() });
} }
} }