From 619bf2d74ef3e5431cb6057698f324590368122b Mon Sep 17 00:00:00 2001 From: Miller Puckette Date: Thu, 22 May 2008 18:25:27 +0000 Subject: 0.42-0 test 01. No real work yet, just bug fixes and updates. svn path=/trunk/; revision=9867 --- pd/src/g_text.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'pd/src/g_text.c') diff --git a/pd/src/g_text.c b/pd/src/g_text.c index bbdb7729..1d4559ec 100644 --- a/pd/src/g_text.c +++ b/pd/src/g_text.c @@ -989,7 +989,7 @@ static void text_select(t_gobj *z, t_glist *glist, int state) t_text *x = (t_text *)z; t_rtext *y = glist_findrtext(glist, x); rtext_select(y, state); - if (glist_isvisible(glist) && text_shouldvis(x, glist)) + if (glist_isvisible(glist) && gobj_shouldvis(&x->te_g, glist)) sys_vgui(".x%lx.c itemconfigure %sR -fill %s\n", glist, rtext_gettag(y), (state? "blue" : "black")); } @@ -1007,22 +1007,12 @@ static void text_delete(t_gobj *z, t_glist *glist) canvas_deletelinesfor(glist, x); } - /* return true if the text box should be drawn. We don't show text boxes - inside graphs---except comments, if we're doing the new (goprect) style. */ -int text_shouldvis(t_text *x, t_glist *glist) -{ - return (glist->gl_havewindow || - (x->te_pd != canvas_class && x->te_pd->c_wb != &text_widgetbehavior) || - (x->te_pd == canvas_class && (((t_glist *)x)->gl_isgraph)) || - (glist->gl_goprect && (x->te_type == T_TEXT))); -} - static void text_vis(t_gobj *z, t_glist *glist, int vis) { t_text *x = (t_text *)z; if (vis) { - if (text_shouldvis(x, glist)) + if (gobj_shouldvis(&x->te_g, glist)) { t_rtext *y = glist_findrtext(glist, x); if (x->te_type == T_ATOM) @@ -1035,7 +1025,7 @@ static void text_vis(t_gobj *z, t_glist *glist, int vis) else { t_rtext *y = glist_findrtext(glist, x); - if (text_shouldvis(x, glist)) + if (gobj_shouldvis(&x->te_g, glist)) { text_eraseborder(x, glist, rtext_gettag(y)); rtext_erase(y); -- cgit v1.2.1