From f2ee701ab1dc2ab822b4207ad92727f212c841c2 Mon Sep 17 00:00:00 2001 From: Ivica Ico Bukvic <ico@vt.edu> Date: Fri, 31 Dec 2010 03:29:00 -0500 Subject: [PATCH] Pd-0.42.5-extended-l2ork-dev-20101230.tar.bz2 --- src/g_editor.c | 4 ++-- src/g_text.c | 21 +++++++++++---------- src/m_pd.h | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/g_editor.c b/src/g_editor.c index aeff31321..c2ad235ed 100644 --- a/src/g_editor.c +++ b/src/g_editor.c @@ -1055,8 +1055,8 @@ static void canvas_rightclick(t_canvas *x, int xpos, int ypos, t_gobj *y) /* abstractions should only allow for properties inside them otherwise they end-up being dirty without visible notification besides, why would one mess with their properties without - seeing what is inside them? */ - canprop = (!y || (y && class_getpropertiesfn(pd_class(&y->g_pd))) && !canvas_isabstraction( ((t_glist*)y) ) ); + seeing what is inside them? CURRENTLY DISABLED */ + canprop = (!y || (y && class_getpropertiesfn(pd_class(&y->g_pd))) /*&& !canvas_isabstraction( ((t_glist*)y) )*/ ); canopen = (y && zgetfn(&y->g_pd, gensym("menu-open"))); if (y) { isobject = 1; diff --git a/src/g_text.c b/src/g_text.c index 126906a5b..04af1f111 100644 --- a/src/g_text.c +++ b/src/g_text.c @@ -1054,22 +1054,23 @@ static void text_getrect(t_gobj *z, t_glist *glist, /* now find if we have more inlets or outlets than what can comfortably fit and adjust accordingly - but only do so if this is not gop object + NB: textless GOPs are unaffected and are treated + as GUI objects */ //fprintf(stderr,"isgraph %d\n", ((t_glist *)z)->gl_isgraph); - if (!((t_glist *)z)->gl_isgraph) { + //if (!((t_glist *)z)->gl_isgraph) { - t_object *ob = pd_checkobject(&x->te_pd); - int no = obj_noutlets(ob); - int ni = obj_ninlets(ob); + t_object *ob = pd_checkobject(&x->te_pd); + int no = obj_noutlets(ob); + int ni = obj_ninlets(ob); - int m = ( ni > no ? ni : no); - if ( width < IOWIDTH * 2 * m ) { - /* we have to resize the object */ - width = IOWIDTH * 2 * m; - } + int m = ( ni > no ? ni : no); + 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 c7c297740..f5393a118 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-20101229" +#define PD_TEST_VERSION "extended-l2ork-20101230" /* 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