Commit 5b5a2598 authored by Christoffer Ackelman's avatar Christoffer Ackelman

Added missing line from junction to (not yet created) FlowCon/GlowCon.

parent fdd4a7b6
...@@ -557,6 +557,10 @@ void FlowCtx::draw(int ll_x, int ll_y, int ur_x, int ur_y) ...@@ -557,6 +557,10 @@ void FlowCtx::draw(int ll_x, int ll_y, int ur_x, int ur_y)
select_rect_ur_x - select_rect_ll_x, select_rect_ur_x - select_rect_ll_x,
select_rect_ur_y - select_rect_ll_y, flow_eDrawType_Line, 0, 0); select_rect_ur_y - select_rect_ll_y, flow_eDrawType_Line, 0, 0);
} }
if (con_create_active) {
fdraw->line(con_create_conpoint_x, con_create_conpoint_y,
con_create_last_x, con_create_last_y, flow_eDrawType_Line, 0);
}
tiptext->draw(); tiptext->draw();
} }
......
...@@ -731,6 +731,10 @@ void GlowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y) ...@@ -731,6 +731,10 @@ void GlowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y)
select_rect_ur_x - select_rect_ll_x, select_rect_ur_x - select_rect_ll_x,
select_rect_ur_y - select_rect_ll_y, glow_eDrawType_Line, 0, 0); select_rect_ur_y - select_rect_ll_y, glow_eDrawType_Line, 0, 0);
} }
if (con_create_active) {
gdraw->line(con_create_conpoint_x, con_create_conpoint_y,
con_create_last_x, con_create_last_y, glow_eDrawType_Line, 0);
}
if (show_grid) if (show_grid)
draw_grid(mw, ll_x, ll_y, ur_x, ur_y); draw_grid(mw, ll_x, ll_y, ur_x, ur_y);
} else if (w == navw) { } else if (w == navw) {
......
...@@ -2483,7 +2483,8 @@ void GrowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y) ...@@ -2483,7 +2483,8 @@ void GrowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y)
} }
gdraw->reset_clip_rectangle(w); gdraw->reset_clip_rectangle(w);
if (w == mw && select_rect_active) { if (w == mw) {
if (select_rect_active) {
if (edit_mode == grow_eMode_Circle) if (edit_mode == grow_eMode_Circle)
gdraw->arc(select_rect_ll_x, select_rect_ll_y, gdraw->arc(select_rect_ll_x, select_rect_ll_y,
select_rect_ur_x - select_rect_ll_x, select_rect_ur_x - select_rect_ll_x,
...@@ -2493,6 +2494,11 @@ void GrowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y) ...@@ -2493,6 +2494,11 @@ void GrowCtx::draw(DrawWind* w, int ll_x, int ll_y, int ur_x, int ur_y)
gdraw->rect(select_rect_ll_x, select_rect_ll_y, gdraw->rect(select_rect_ll_x, select_rect_ll_y,
select_rect_ur_x - select_rect_ll_x, select_rect_ur_x - select_rect_ll_x,
select_rect_ur_y - select_rect_ll_y, glow_eDrawType_Line, 0, 0); select_rect_ur_y - select_rect_ll_y, glow_eDrawType_Line, 0, 0);
}
if (con_create_active) {
gdraw->line(con_create_conpoint_x, con_create_conpoint_y,
con_create_last_x, con_create_last_y, glow_eDrawType_Line, 0);
}
} else if (w == navw) { } else if (w == navw) {
nav_rect_ll_x = int( nav_rect_ll_x = int(
navw->zoom_factor_x * mw->offset_x / mw->zoom_factor_x - navw->offset_x); navw->zoom_factor_x * mw->offset_x / mw->zoom_factor_x - navw->offset_x);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment