Commit 4c43fc05 authored by Ivica Bukvic's avatar Ivica Bukvic
Browse files

*made sure that iemgui labels are only drawn selected if they are on parent canvas

*cleaned up formatting to make source more legible
parent f0ec2753
...@@ -945,10 +945,12 @@ void iemgui_label_draw_new(t_iemgui *x, t_glist *canvas, int xpos, int ypos, con ...@@ -945,10 +945,12 @@ void iemgui_label_draw_new(t_iemgui *x, t_glist *canvas, int xpos, int ypos, con
iemgui_font(x), x->x_fontsize, sys_fontweight, iemgui_font(x), x->x_fontsize, sys_fontweight,
x->x_lcol, x, x, nlet_tag); x->x_lcol, x, x, nlet_tag);
} }
void iemgui_label_draw_move(t_iemgui *x, t_glist *canvas, int xpos, int ypos) { void iemgui_label_draw_move(t_iemgui *x, t_glist *canvas, int xpos, int ypos) {
sys_vgui(".x%lx.c coords %lxLABEL %d %d\n", sys_vgui(".x%lx.c coords %lxLABEL %d %d\n",
canvas, x, xpos+x->x_ldx, ypos+x->x_ldy); canvas, x, xpos+x->x_ldx, ypos+x->x_ldy);
} }
void iemgui_label_draw_config(t_iemgui *x, t_glist *canvas) { void iemgui_label_draw_config(t_iemgui *x, t_glist *canvas) {
if (x->x_selected && x->x_glist == canvas) if (x->x_selected && x->x_glist == canvas)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} " sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} "
...@@ -961,8 +963,9 @@ void iemgui_label_draw_config(t_iemgui *x, t_glist *canvas) { ...@@ -961,8 +963,9 @@ void iemgui_label_draw_config(t_iemgui *x, t_glist *canvas) {
canvas, x, iemgui_font(x), x->x_fontsize, sys_fontweight, canvas, x, iemgui_font(x), x->x_fontsize, sys_fontweight,
x->x_lcol, x->x_lab!=s_empty?x->x_lab->s_name:""); x->x_lcol, x->x_lab!=s_empty?x->x_lab->s_name:"");
} }
void iemgui_label_draw_select(t_iemgui *x, t_glist *canvas) { void iemgui_label_draw_select(t_iemgui *x, t_glist *canvas) {
if(x->x_selected) if (x->x_selected && x->x_glist == canvas)
sys_vgui(".x%lx.c itemconfigure %lxLABEL " sys_vgui(".x%lx.c itemconfigure %lxLABEL "
"-fill $pd_colors(selection)\n", canvas, x); "-fill $pd_colors(selection)\n", canvas, x);
else else
......
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