From 087352acfae4d059661c23bb9db672fe4b9b78f5 Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Thu, 1 Aug 2013 14:48:05 -0400
Subject: [PATCH] fixed select bug when changing iemgui labels within GOP
---
pd/src/g_bang.c | 2 +-
pd/src/g_hdial.c | 2 +-
pd/src/g_hslider.c | 2 +-
pd/src/g_mycanvas.c | 2 +-
pd/src/g_numbox.c | 2 +-
pd/src/g_toggle.c | 2 +-
pd/src/g_vdial.c | 2 +-
pd/src/g_vslider.c | 2 +-
pd/src/g_vumeter.c | 2 +-
pd/src/m_pd.h | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pd/src/g_bang.c b/pd/src/g_bang.c
index 0ee861634..02a5c4a51 100644
--- a/pd/src/g_bang.c
+++ b/pd/src/g_bang.c
@@ -183,7 +183,7 @@ void bng_draw_config(t_bng* x, t_glist* glist)
sprintf(color, "#%6.6x", x->x_gui.x_lcol);
*/
- if (x->x_gui.x_fsf.x_selected)
+ if (x->x_gui.x_fsf.x_selected && x->x_gui.x_glist == canvas)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/pd/src/g_hdial.c b/pd/src/g_hdial.c
index 17dc4afb1..605cd0523 100644
--- a/pd/src/g_hdial.c
+++ b/pd/src/g_hdial.c
@@ -206,7 +206,7 @@ void hradio_draw_config(t_hradio* x, t_glist* glist)
sprintf(color, "#%6.6x", x->x_gui.x_lcol);
*/
- if (x->x_gui.x_fsf.x_selected)
+ if (x->x_gui.x_fsf.x_selected && x->x_gui.x_glist == canvas)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/pd/src/g_hslider.c b/pd/src/g_hslider.c
index 3287f51e8..bcbca4627 100644
--- a/pd/src/g_hslider.c
+++ b/pd/src/g_hslider.c
@@ -206,7 +206,7 @@ static void hslider_draw_config(t_hslider* x,t_glist* glist)
sprintf(color, "#%6.6x", x->x_gui.x_lcol);
*/
- if (x->x_gui.x_fsf.x_selected)
+ if (x->x_gui.x_fsf.x_selected && x->x_gui.x_glist == canvas)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/pd/src/g_mycanvas.c b/pd/src/g_mycanvas.c
index a59d012ce..ef6131e61 100644
--- a/pd/src/g_mycanvas.c
+++ b/pd/src/g_mycanvas.c
@@ -123,7 +123,7 @@ void my_canvas_draw_config(t_my_canvas* x, t_glist* glist)
sys_vgui(".x%lx.c itemconfigure %lxRECT -fill #%6.6x -outline #%6.6x\n", canvas, x,
x->x_gui.x_bcol, x->x_gui.x_bcol);
- if (x->x_gui.x_fsf.x_selected)
+ if (x->x_gui.x_fsf.x_selected && x->x_gui.x_glist == canvas)
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline $select_color\n", canvas, x);
else
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x,
diff --git a/pd/src/g_numbox.c b/pd/src/g_numbox.c
index 0c70883b9..8c8f3facb 100644
--- a/pd/src/g_numbox.c
+++ b/pd/src/g_numbox.c
@@ -366,7 +366,7 @@ static void my_numbox_draw_config(t_my_numbox* x,t_glist* glist)
}
*/
- if (x->x_gui.x_fsf.x_selected) {
+ if (x->x_gui.x_fsf.x_selected && x->x_gui.x_glist == canvas) {
sys_vgui(" .x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n .x%lx.c itemconfigure %lxNUMBER -font {{%s} -%d %s} -fill $select_color \n .x%lx.c itemconfigure %lxBASE2 -fill $select_color\n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"",
diff --git a/pd/src/g_toggle.c b/pd/src/g_toggle.c
index 8e9369644..7b877e4d1 100644
--- a/pd/src/g_toggle.c
+++ b/pd/src/g_toggle.c
@@ -194,7 +194,7 @@ void toggle_draw_config(t_toggle* x, t_glist* glist)
color,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
*/
- if (x->x_gui.x_fsf.x_selected) {
+ if (x->x_gui.x_fsf.x_selected && x->x_gui.x_glist == canvas) {
sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/pd/src/g_vdial.c b/pd/src/g_vdial.c
index 119e3fef3..07583b534 100644
--- a/pd/src/g_vdial.c
+++ b/pd/src/g_vdial.c
@@ -205,7 +205,7 @@ void vradio_draw_config(t_vradio* x, t_glist* glist)
sprintf(color, "#%6.6x", x->x_gui.x_lcol);
*/
- if (x->x_gui.x_fsf.x_selected)
+ if (x->x_gui.x_fsf.x_selected && x->x_gui.x_glist == canvas)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/pd/src/g_vslider.c b/pd/src/g_vslider.c
index 7514b31e0..4b83fa193 100644
--- a/pd/src/g_vslider.c
+++ b/pd/src/g_vslider.c
@@ -209,7 +209,7 @@ static void vslider_draw_config(t_vslider* x,t_glist* glist)
sprintf(color, "#%6.6x", x->x_gui.x_lcol);
*/
- if (x->x_gui.x_fsf.x_selected)
+ if (x->x_gui.x_fsf.x_selected && x->x_gui.x_glist == canvas)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/pd/src/g_vumeter.c b/pd/src/g_vumeter.c
index 71b04d304..6d09a5616 100644
--- a/pd/src/g_vumeter.c
+++ b/pd/src/g_vumeter.c
@@ -367,7 +367,7 @@ static void vu_draw_config(t_vu* x, t_glist* glist)
x->x_gui.x_fontsize, sys_fontweight,
x->x_gui.x_lcol);
}
- if (x->x_gui.x_fsf.x_selected)
+ if (x->x_gui.x_fsf.x_selected && x->x_gui.x_glist == canvas)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -font {{%s} -%d %s} -fill $select_color -text {%s} \n",
canvas, x, x->x_gui.x_font, x->x_gui.x_fontsize, sys_fontweight,
strcmp(x->x_gui.x_lab->s_name, "empty")?x->x_gui.x_lab->s_name:"");
diff --git a/pd/src/m_pd.h b/pd/src/m_pd.h
index 94a19562d..f1a4fda63 100644
--- a/pd/src/m_pd.h
+++ b/pd/src/m_pd.h
@@ -11,7 +11,7 @@ extern "C" {
#define PD_MAJOR_VERSION 0
#define PD_MINOR_VERSION 42
#define PD_BUGFIX_VERSION 7
-#define PD_TEST_VERSION "20130523"
+#define PD_TEST_VERSION "20130724"
#define PDL2ORK
/* old name for "MSW" flag -- we have to take it for the sake of many old
--
GitLab