Skip to content
Snippets Groups Projects
Commit f1f16150 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch '20200831-rtext'

parents 870b0c8f 751ef6d6
No related branches found
No related tags found
1 merge request!509*reenabled checking for duplicate rtext activation which may be responsible...
Pipeline #2692 failed
......@@ -527,7 +527,7 @@ void rtext_erase(t_rtext *x)
// sys_vgui(".x%lx.c delete %s\n", glist_getcanvas(x->x_glist), x->x_tag);
}
/* Not needed since the rtext gets erased along with the parent gobj group */
/* Not needed since the rtext gets displaced along with the parent gobj group */
void rtext_displace(t_rtext *x, int dx, int dy)
{
//sys_vgui(".x%lx.c move %s %d %d\n", glist_getcanvas(x->x_glist),
......@@ -565,7 +565,10 @@ void rtext_activate(t_rtext *x, int state)
char *tmpbuf;
t_glist *glist = x->x_glist;
t_canvas *canvas = glist_getcanvas(glist);
//if (state && x->x_active) printf("duplicate rtext_activate\n");
if (state && x->x_active) {
//fprintf(stderr, "duplicate rtext_activate\n");
return;
}
// the following prevents from selecting all when inside an
// object that is already being texted for... please *test*
// "fixes" before committing them
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment