From 5e13ec71ded60cc33aa34bd2e86d8bea5852c070 Mon Sep 17 00:00:00 2001 From: Ivica Ico Bukvic <ico@vt.edu> Date: Tue, 29 Nov 2011 14:17:00 -0500 Subject: [PATCH] Added files I forgot to add to the 11-22-2011 patch --- src/g_text.c | 11 +++++++---- src/m_pd.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/g_text.c b/src/g_text.c index 104fa3d1c..eb3eb2c5e 100644 --- a/src/g_text.c +++ b/src/g_text.c @@ -1089,11 +1089,14 @@ static void text_getrect(t_gobj *z, t_glist *glist, int ni = obj_ninlets(ob); int m = ( ni > no ? ni : no); - if ( width < (IOWIDTH * m) * 2 - IOWIDTH) { - /* we have to resize the object */ - width = (IOWIDTH * m) * 2 - IOWIDTH; + //let's see if the object has more nlets than its text width and resize them accordingly + //UNLESS we are gop in which case it is user's choice how big/small they want the object + if (!((t_glist *)z)->gl_isgraph) { + if (width < (IOWIDTH * m) * 2 - IOWIDTH) { + //we have to resize the object + width = (IOWIDTH * m) * 2 - IOWIDTH; + } } - //} height = rtext_height(y) - (iscomment << 1); } else width = height = 10; diff --git a/src/m_pd.h b/src/m_pd.h index 8fc774716..9a7fcd843 100644 --- a/src/m_pd.h +++ b/src/m_pd.h @@ -11,7 +11,7 @@ extern "C" { #define PD_MAJOR_VERSION 0 #define PD_MINOR_VERSION 42 #define PD_BUGFIX_VERSION 5 -#define PD_TEST_VERSION "extended-l2ork-20111025" +#define PD_TEST_VERSION "extended-l2ork-20111122" /* old name for "MSW" flag -- we have to take it for the sake of many old "nmakefiles" for externs, which will define NT and not MSW */ -- GitLab