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

Demo: Renamed "Layout" -> "Layout & Scrolling". Fixed usage of local struct as template class (c++11).

Browse Source
This commit is contained in:
omar 2020-08-05 17:10:06 +02:00
parent 473a01adb0
commit fc61018b1c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
imgui_demo.cpp
View File

@ -1960,7 +1960,7 @@ static void ShowDemoWindowWidgets()
static void ShowDemoWindowLayout() static void ShowDemoWindowLayout()
{ {
if (!ImGui::CollapsingHeader("Layout")) if (!ImGui::CollapsingHeader("Layout & Scrolling"))
return; return;
if (ImGui::TreeNode("Child windows")) if (ImGui::TreeNode("Child windows"))
@ -4993,8 +4993,7 @@ static void ShowExampleAppCustomRendering(bool* p_open)
if (ImGui::BeginTabItem("Canvas")) if (ImGui::BeginTabItem("Canvas"))
{ {
struct ItemLine { ImVec2 p0, p1; ItemLine(const ImVec2& _p0, const ImVec2& _p1) { p0 = _p0; p1 = _p1; } }; static ImVector<ImVec2> points;
static ImVector<ItemLine> lines;
static ImVec2 scrolling(0.0f, 0.0f); static ImVec2 scrolling(0.0f, 0.0f);
static bool opt_enable_grid = true; static bool opt_enable_grid = true;
static bool opt_enable_context_menu = true; static bool opt_enable_context_menu = true;
@ -5038,12 +5037,13 @@ static void ShowExampleAppCustomRendering(bool* p_open)
// Add first and second point // Add first and second point
if (is_hovered && !adding_line && ImGui::IsMouseClicked(ImGuiMouseButton_Left)) if (is_hovered && !adding_line && ImGui::IsMouseClicked(ImGuiMouseButton_Left))
{ {
lines.push_back(ItemLine(mouse_pos_in_canvas, mouse_pos_in_canvas)); points.push_back(mouse_pos_in_canvas);
points.push_back(mouse_pos_in_canvas);
adding_line = true; adding_line = true;
} }
if (adding_line) if (adding_line)
{ {
lines.back().p1 = mouse_pos_in_canvas; points.back() = mouse_pos_in_canvas;
if (!ImGui::IsMouseDown(ImGuiMouseButton_Left)) if (!ImGui::IsMouseDown(ImGuiMouseButton_Left))
adding_line = false; adding_line = false;
} }
@ -5064,10 +5064,10 @@ static void ShowExampleAppCustomRendering(bool* p_open)
if (ImGui::BeginPopup("context")) if (ImGui::BeginPopup("context"))
{ {
if (adding_line) if (adding_line)
lines.pop_back(); points.resize(points.size() - 2);
adding_line = false; adding_line = false;
if (ImGui::MenuItem("Remove one", NULL, false, lines.Size > 0)) { lines.pop_back(); } if (ImGui::MenuItem("Remove one", NULL, false, points.Size > 0)) { points.resize(points.size() - 2); }
if (ImGui::MenuItem("Remove all", NULL, false, lines.Size > 0)) { lines.clear(); } if (ImGui::MenuItem("Remove all", NULL, false, points.Size > 0)) { points.clear(); }
ImGui::EndPopup(); ImGui::EndPopup();
} }
@ -5081,8 +5081,8 @@ static void ShowExampleAppCustomRendering(bool* p_open)
for (float y = fmodf(scrolling.y, GRID_STEP); y < canvas_sz.y; y += GRID_STEP) for (float y = fmodf(scrolling.y, GRID_STEP); y < canvas_sz.y; y += GRID_STEP)
draw_list->AddLine(ImVec2(canvas_p0.x, canvas_p0.y + y), ImVec2(canvas_p1.x, canvas_p0.y + y), IM_COL32(200, 200, 200, 40)); draw_list->AddLine(ImVec2(canvas_p0.x, canvas_p0.y + y), ImVec2(canvas_p1.x, canvas_p0.y + y), IM_COL32(200, 200, 200, 40));
} }
for (int n = 0; n < lines.Size; n++) for (int n = 0; n < points.Size; n += 2)
draw_list->AddLine(ImVec2(origin.x + lines[n].p0.x, origin.y + lines[n].p0.y), ImVec2(origin.x + lines[n].p1.x, origin.y + lines[n].p1.y), IM_COL32(255, 255, 0, 255), 2.0f); draw_list->AddLine(ImVec2(origin.x + points[n].x, origin.y + points[n].y), ImVec2(origin.x + points[n + 1].x, origin.y + points[n + 1].y), IM_COL32(255, 255, 0, 255), 2.0f);
draw_list->PopClipRect(); draw_list->PopClipRect();
ImGui::EndTabItem(); ImGui::EndTabItem();