Commit 07d3d500 authored by Ivica Bukvic's avatar Ivica Bukvic
Browse files

fixed consistency check error for magicGlass (regression)

parent ceaa694b
...@@ -1202,6 +1202,13 @@ static void text_getrect(t_gobj *z, t_glist *glist, ...@@ -1202,6 +1202,13 @@ static void text_getrect(t_gobj *z, t_glist *glist,
width = (x->te_width > 0 ? x->te_width : 6) * fontwidth + 2; width = (x->te_width > 0 ? x->te_width : 6) * fontwidth + 2;
height = fontheight + 3; /* borrowed from TMARGIN, etc, in g_rtext.c */ height = fontheight + 3; /* borrowed from TMARGIN, etc, in g_rtext.c */
} }
// jsarlo
else if (strcmp("magicGlass", class_getname(x->ob_pd)) == 0)
{
width = 0;
height = 0;
}
// end jsarlo
else if (x->te_type == T_TEXT) else if (x->te_type == T_TEXT)
{ {
//fprintf(stderr," T_TEXT\n"); //fprintf(stderr," T_TEXT\n");
...@@ -1221,14 +1228,6 @@ static void text_getrect(t_gobj *z, t_glist *glist, ...@@ -1221,14 +1228,6 @@ static void text_getrect(t_gobj *z, t_glist *glist,
flag because we might be within the vis() routine and not have set flag because we might be within the vis() routine and not have set
that yet. So we check directly whether the "rtext" list has been that yet. So we check directly whether the "rtext" list has been
built. LATER reconsider when "vis" flag should be on and off? */ built. LATER reconsider when "vis" flag should be on and off? */
// jsarlo
else if (strcmp("magicGlass", class_getname(x->ob_pd)) == 0)
{
width = 0;
height = 0;
}
// end jsarlo
else if (glist->gl_editor && glist->gl_editor->e_rtext) else if (glist->gl_editor && glist->gl_editor->e_rtext)
{ {
t_rtext *y = glist_findrtext(glist, x); t_rtext *y = glist_findrtext(glist, 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