Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 01:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweak RenderCheckMark()

Browse Source
This commit is contained in:
ocornut 2015-05-07 17:11:32 +01:00
parent 85b8967291
commit c36172ebef
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
imgui.cpp
View File

@ -501,7 +501,7 @@ static void RenderTextWrapped(ImVec2 pos, const char* text, const char*
static void RenderTextClipped(ImVec2 pos, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& clip_max); static void RenderTextClipped(ImVec2 pos, const char* text, const char* text_end, const ImVec2* text_size_if_known, const ImVec2& clip_max);
static void RenderFrame(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, bool border = true, float rounding = 0.0f); static void RenderFrame(ImVec2 p_min, ImVec2 p_max, ImU32 fill_col, bool border = true, float rounding = 0.0f);
static void RenderCollapseTriangle(ImVec2 p_min, bool opened, float scale = 1.0f, bool shadow = false); static void RenderCollapseTriangle(ImVec2 p_min, bool opened, float scale = 1.0f, bool shadow = false);
static void RenderCheckMark(ImVec2 pos); static void RenderCheckMark(ImVec2 pos, ImU32 col);
static void SetFont(ImFont* font); static void SetFont(ImFont* font);
static bool ItemAdd(const ImRect& bb, const ImGuiID* id); static bool ItemAdd(const ImRect& bb, const ImGuiID* id);
@ -2529,20 +2529,23 @@ static void RenderCollapseTriangle(ImVec2 p_min, bool opened, float scale, bool
window->DrawList->AddTriangleFilled(a, b, c, window->Color(ImGuiCol_Text)); window->DrawList->AddTriangleFilled(a, b, c, window->Color(ImGuiCol_Text));
} }
static void RenderCheckMark(ImVec2 pos) static void RenderCheckMark(ImVec2 pos, ImU32 col)
{ {
ImGuiState& g = *GImGui; ImGuiState& g = *GImGui;
ImGuiWindow* window = GetCurrentWindow(); ImGuiWindow* window = GetCurrentWindow();
float ax = (float)(int)(g.FontSize * 0.307f + 0.5f); // Spacing ImVec2 a, b, c;
float rem_third = (float)(int)((g.FontSize - ax) / 3.0f); float start_x = (float)(int)(g.FontSize * 0.307f + 0.5f);
float bx = ax + rem_third; float rem_third = (float)(int)((g.FontSize - start_x) / 3.0f);
float cx = ax + rem_third * 3.0f; a.x = pos.x + start_x;
float by = (float)(int)(g.Font->BaseLine * (g.FontSize / g.Font->FontSize) + 0.5f) + (float)(int)(g.Font->DisplayOffset.y); b.x = a.x + rem_third;
float ay = by - rem_third; c.x = a.x + rem_third * 3.0f;
float cy = by - rem_third * 2.0f; b.y = pos.y + (float)(int)(g.Font->BaseLine * (g.FontSize / g.Font->FontSize) + 0.5f) + (float)(int)(g.Font->DisplayOffset.y);
window->DrawList->AddLine(ImVec2(pos.x + ax, pos.y + ay), ImVec2(pos.x + bx, pos.y + by), window->Color(ImGuiCol_Text)); a.y = b.y - rem_third;
window->DrawList->AddLine(ImVec2(pos.x + bx, pos.y + by), ImVec2(pos.x + cx, pos.y + cy), window->Color(ImGuiCol_Text)); c.y = b.y - rem_third * 2.0f;
window->DrawList->AddLine(a, b, col);
window->DrawList->AddLine(b, c, col);
} }
// Calculate text size. Text can be multi-line. Optionally ignore text after a ## marker. // Calculate text size. Text can be multi-line. Optionally ignore text after a ## marker.