|
|
@@ -1401,8 +1401,8 @@ void ImGui::ShowDemoWindow(bool* p_open)
|
|
|
ImVec4 clip_rect(pos.x, pos.y, pos.x+size.x, pos.y+size.y);
|
|
|
ImGui::InvisibleButton("##dummy", size);
|
|
|
if (ImGui::IsItemActive() && ImGui::IsMouseDragging()) { offset.x += ImGui::GetIO().MouseDelta.x; offset.y += ImGui::GetIO().MouseDelta.y; }
|
|
|
- ImGui::GetWindowDrawList()->AddRectFilled(pos, ImVec2(pos.x+size.x,pos.y+size.y), ImColor(90,90,120,255));
|
|
|
- ImGui::GetWindowDrawList()->AddText(ImGui::GetFont(), ImGui::GetFontSize()*2.0f, ImVec2(pos.x+offset.x,pos.y+offset.y), ImColor(255,255,255,255), "Line 1 hello\nLine 2 clip me!", NULL, 0.0f, &clip_rect);
|
|
|
+ ImGui::GetWindowDrawList()->AddRectFilled(pos, ImVec2(pos.x+size.x,pos.y+size.y), IM_COL32(90,90,120,255));
|
|
|
+ ImGui::GetWindowDrawList()->AddText(ImGui::GetFont(), ImGui::GetFontSize()*2.0f, ImVec2(pos.x+offset.x,pos.y+offset.y), IM_COL32(255,255,255,255), "Line 1 hello\nLine 2 clip me!", NULL, 0.0f, &clip_rect);
|
|
|
ImGui::TreePop();
|
|
|
}
|
|
|
}
|
|
|
@@ -2490,7 +2490,7 @@ static void ShowExampleAppCustomRendering(bool* p_open)
|
|
|
draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x+sz, y+sz), col32, 10.0f); x += sz+spacing;
|
|
|
draw_list->AddRectFilled(ImVec2(x, y), ImVec2(x+sz, y+sz), col32, 10.0f, ImDrawCornerFlags_TopLeft|ImDrawCornerFlags_BotRight); x += sz+spacing;
|
|
|
draw_list->AddTriangleFilled(ImVec2(x+sz*0.5f, y), ImVec2(x+sz,y+sz-0.5f), ImVec2(x,y+sz-0.5f), col32); x += sz+spacing;
|
|
|
- draw_list->AddRectFilledMultiColor(ImVec2(x, y), ImVec2(x+sz, y+sz), ImColor(0,0,0), ImColor(255,0,0), ImColor(255,255,0), ImColor(0,255,0));
|
|
|
+ draw_list->AddRectFilledMultiColor(ImVec2(x, y), ImVec2(x+sz, y+sz), IM_COL32(0,0,0,255), IM_COL32(255,0,0,255), IM_COL32(255,255,0,255), IM_COL32(0,255,0,255));
|
|
|
ImGui::Dummy(ImVec2((sz+spacing)*8, (sz+spacing)*3));
|
|
|
}
|
|
|
ImGui::Separator();
|
|
|
@@ -2509,8 +2509,8 @@ static void ShowExampleAppCustomRendering(bool* p_open)
|
|
|
ImVec2 canvas_size = ImGui::GetContentRegionAvail(); // Resize canvas to what's available
|
|
|
if (canvas_size.x < 50.0f) canvas_size.x = 50.0f;
|
|
|
if (canvas_size.y < 50.0f) canvas_size.y = 50.0f;
|
|
|
- draw_list->AddRectFilledMultiColor(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), ImColor(50,50,50), ImColor(50,50,60), ImColor(60,60,70), ImColor(50,50,60));
|
|
|
- draw_list->AddRect(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), ImColor(255,255,255));
|
|
|
+ draw_list->AddRectFilledMultiColor(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), IM_COL32(50,50,50,255), IM_COL32(50,50,60,255), IM_COL32(60,60,70,255), IM_COL32(50,50,60,255));
|
|
|
+ draw_list->AddRect(canvas_pos, ImVec2(canvas_pos.x + canvas_size.x, canvas_pos.y + canvas_size.y), IM_COL32(255,255,255,255));
|
|
|
|
|
|
bool adding_preview = false;
|
|
|
ImGui::InvisibleButton("canvas", canvas_size);
|
|
|
@@ -2519,7 +2519,7 @@ static void ShowExampleAppCustomRendering(bool* p_open)
|
|
|
{
|
|
|
adding_preview = true;
|
|
|
points.push_back(mouse_pos_in_canvas);
|
|
|
- if (!ImGui::GetIO().MouseDown[0])
|
|
|
+ if (!ImGui::IsMouseDown(0))
|
|
|
adding_line = adding_preview = false;
|
|
|
}
|
|
|
if (ImGui::IsItemHovered())
|
omar