From 07d3d500a78aca1302dcb32fcc5228e965eff1b8 Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Mon, 20 May 2013 15:54:25 -0400
Subject: [PATCH] fixed consistency check error for magicGlass (regression)
---
pd/src/g_text.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/pd/src/g_text.c b/pd/src/g_text.c
index 9f7cd736f..09eabe9b6 100644
--- a/pd/src/g_text.c
+++ b/pd/src/g_text.c
@@ -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;
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)
{
//fprintf(stderr," T_TEXT\n");
@@ -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
that yet. So we check directly whether the "rtext" list has been
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)
{
t_rtext *y = glist_findrtext(glist, x);
--
GitLab