From a26200c5d5bafee8e8831e40f9f071cdd028834a Mon Sep 17 00:00:00 2001
From: Ivica Ico Bukvic <ico@vt.edu>
Date: Fri, 29 Mar 2013 13:24:32 -0400
Subject: [PATCH] fixed regression in the iemgui move handle for object labels
where text would erroneously disappear as a result of a commit earlier today
---
pd/src/g_bang.c | 10 +++++-----
pd/src/g_hdial.c | 10 +++++-----
pd/src/g_hslider.c | 10 +++++-----
pd/src/g_mycanvas.c | 10 +++++-----
pd/src/g_numbox.c | 10 +++++-----
pd/src/g_toggle.c | 10 +++++-----
pd/src/g_vdial.c | 10 +++++-----
pd/src/g_vslider.c | 10 +++++-----
pd/src/g_vumeter.c | 10 +++++-----
9 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/pd/src/g_bang.c b/pd/src/g_bang.c
index 285319a45..8ee4c3aae 100644
--- a/pd/src/g_bang.c
+++ b/pd/src/g_bang.c
@@ -158,7 +158,7 @@ void bng_draw_erase(t_bng* x, t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
/*
sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x);
@@ -278,16 +278,16 @@ void bng_draw_select(t_bng* x, t_glist* glist)
{
if (x->x_gui.label_vis) {
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
- sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxBNG}\n",
+ sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxLABELH %lxBNG}\n",
canvas, x->x_gui.x_obj.te_xpix+ x->x_gui.x_ldx - LABELHANDLE_WIDTH,
x->x_gui.x_obj.te_ypix + x->x_gui.x_ldy - LABELHANDLE_HEIGHT,
LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT,
- lh->h_pathname, x, x);
+ lh->h_pathname, x, x, x);
sys_vgui("bind %s <Button> {pd [concat %s _click 1 %%x %%y \\;]}\n",
lh->h_pathname, lh->h_bindsym->s_name);
sys_vgui("bind %s <ButtonRelease> {pd [concat %s _click 0 0 0 \\;]}\n",
@@ -310,7 +310,7 @@ void bng_draw_select(t_bng* x, t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
x->x_gui.scale_vis = 0;
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
x->x_gui.label_vis = 0;
}
//}
diff --git a/pd/src/g_hdial.c b/pd/src/g_hdial.c
index d7a1062e2..7a4246e14 100644
--- a/pd/src/g_hdial.c
+++ b/pd/src/g_hdial.c
@@ -177,7 +177,7 @@ void hradio_draw_erase(t_hradio* x, t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
/*
for(i=0; i<n; i++)
@@ -310,16 +310,16 @@ void hradio_draw_select(t_hradio* x, t_glist* glist)
{
if (x->x_gui.label_vis) {
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
- sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxHRDO}\n",
+ sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxLABELH %lxHRDO}\n",
canvas, x->x_gui.x_obj.te_xpix+ x->x_gui.x_ldx - LABELHANDLE_WIDTH,
x->x_gui.x_obj.te_ypix + x->x_gui.x_ldy - LABELHANDLE_HEIGHT,
LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT,
- lh->h_pathname, x, x);
+ lh->h_pathname, x, x, x);
sys_vgui("bind %s <Button> {pd [concat %s _click 1 %%x %%y \\;]}\n",
lh->h_pathname, lh->h_bindsym->s_name);
sys_vgui("bind %s <ButtonRelease> {pd [concat %s _click 0 0 0 \\;]}\n",
@@ -346,7 +346,7 @@ void hradio_draw_select(t_hradio* x, t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
x->x_gui.scale_vis = 0;
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
x->x_gui.label_vis = 0;
}
//}
diff --git a/pd/src/g_hslider.c b/pd/src/g_hslider.c
index eea9a90ba..bef2d7f4c 100644
--- a/pd/src/g_hslider.c
+++ b/pd/src/g_hslider.c
@@ -181,7 +181,7 @@ static void hslider_draw_erase(t_hslider* x,t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
/*
sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x);
@@ -297,16 +297,16 @@ static void hslider_draw_select(t_hslider* x,t_glist* glist)
{
if (x->x_gui.label_vis) {
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
- sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxHSLDR}\n",
+ sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxLABELH %lxHSLDR}\n",
canvas, x->x_gui.x_obj.te_xpix+ x->x_gui.x_ldx - LABELHANDLE_WIDTH,
x->x_gui.x_obj.te_ypix + x->x_gui.x_ldy - LABELHANDLE_HEIGHT,
LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT,
- lh->h_pathname, x, x);
+ lh->h_pathname, x, x, x);
sys_vgui("bind %s <Button> {pd [concat %s _click 1 %%x %%y \\;]}\n",
lh->h_pathname, lh->h_bindsym->s_name);
sys_vgui("bind %s <ButtonRelease> {pd [concat %s _click 0 0 0 \\;]}\n",
@@ -328,7 +328,7 @@ static void hslider_draw_select(t_hslider* x,t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
x->x_gui.scale_vis = 0;
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
x->x_gui.label_vis = 0;
}
//}
diff --git a/pd/src/g_mycanvas.c b/pd/src/g_mycanvas.c
index 70412688f..698f3513a 100644
--- a/pd/src/g_mycanvas.c
+++ b/pd/src/g_mycanvas.c
@@ -102,7 +102,7 @@ void my_canvas_draw_erase(t_my_canvas* x, t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
//sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x);
//sys_vgui(".x%lx.c delete %lxRECT\n", canvas, x);
@@ -174,16 +174,16 @@ void my_canvas_draw_select(t_my_canvas* x, t_glist* glist)
{
if (x->x_gui.label_vis) {
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
- sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxMYCNV}\n",
+ sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxLABELH %lxMYCNV}\n",
canvas, x->x_gui.x_obj.te_xpix+ x->x_gui.x_ldx - LABELHANDLE_WIDTH,
x->x_gui.x_obj.te_ypix + x->x_gui.x_ldy - LABELHANDLE_HEIGHT,
LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT,
- lh->h_pathname, x, x);
+ lh->h_pathname, x, x, x);
sys_vgui("bind %s <Button> {pd [concat %s _click 1 %%x %%y \\;]}\n",
lh->h_pathname, lh->h_bindsym->s_name);
sys_vgui("bind %s <ButtonRelease> {pd [concat %s _click 0 0 0 \\;]}\n",
@@ -204,7 +204,7 @@ void my_canvas_draw_select(t_my_canvas* x, t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
x->x_gui.scale_vis = 0;
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
x->x_gui.label_vis = 0;
}
//}
diff --git a/pd/src/g_numbox.c b/pd/src/g_numbox.c
index 6ae9499ca..f45f0a6e3 100644
--- a/pd/src/g_numbox.c
+++ b/pd/src/g_numbox.c
@@ -335,7 +335,7 @@ static void my_numbox_draw_erase(t_my_numbox* x,t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
/*
sys_vgui(".x%lx.c delete %lxBASE1\n", canvas, x);
@@ -490,16 +490,16 @@ static void my_numbox_draw_select(t_my_numbox *x, t_glist *glist)
{
if (x->x_gui.label_vis) {
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
- sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxNUM}\n",
+ sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxLABELH %lxNUM}\n",
canvas, x->x_gui.x_obj.te_xpix+ x->x_gui.x_ldx - LABELHANDLE_WIDTH,
x->x_gui.x_obj.te_ypix + x->x_gui.x_ldy - LABELHANDLE_HEIGHT,
LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT,
- lh->h_pathname, x, x);
+ lh->h_pathname, x, x, x);
sys_vgui("bind %s <Button> {pd [concat %s _click 1 %%x %%y \\;]}\n",
lh->h_pathname, lh->h_bindsym->s_name);
sys_vgui("bind %s <ButtonRelease> {pd [concat %s _click 0 0 0 \\;]}\n",
@@ -532,7 +532,7 @@ static void my_numbox_draw_select(t_my_numbox *x, t_glist *glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
x->x_gui.scale_vis = 0;
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
x->x_gui.label_vis = 0;
}
//}
diff --git a/pd/src/g_toggle.c b/pd/src/g_toggle.c
index 5fe306788..e4371d3b8 100644
--- a/pd/src/g_toggle.c
+++ b/pd/src/g_toggle.c
@@ -163,7 +163,7 @@ void toggle_draw_erase(t_toggle* x, t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
/*
sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x);
@@ -296,16 +296,16 @@ void toggle_draw_select(t_toggle* x, t_glist* glist)
{
if (x->x_gui.label_vis) {
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
- sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxTGL}\n",
+ sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxLABELH %lxTGL}\n",
canvas, x->x_gui.x_obj.te_xpix+ x->x_gui.x_ldx - LABELHANDLE_WIDTH,
x->x_gui.x_obj.te_ypix + x->x_gui.x_ldy - LABELHANDLE_HEIGHT,
LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT,
- lh->h_pathname, x, x);
+ lh->h_pathname, x, x, x);
sys_vgui("bind %s <Button> {pd [concat %s _click 1 %%x %%y \\;]}\n",
lh->h_pathname, lh->h_bindsym->s_name);
sys_vgui("bind %s <ButtonRelease> {pd [concat %s _click 0 0 0 \\;]}\n",
@@ -327,7 +327,7 @@ void toggle_draw_select(t_toggle* x, t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
x->x_gui.scale_vis = 0;
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
x->x_gui.label_vis = 0;
}
//}
diff --git a/pd/src/g_vdial.c b/pd/src/g_vdial.c
index ed9a39998..9f00162c0 100644
--- a/pd/src/g_vdial.c
+++ b/pd/src/g_vdial.c
@@ -175,7 +175,7 @@ void vradio_draw_erase(t_vradio* x, t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
/*
@@ -311,16 +311,16 @@ void vradio_draw_select(t_vradio* x, t_glist* glist)
{
if (x->x_gui.label_vis) {
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
- sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxVDRO}\n",
+ sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxLABELH lxVDRO}\n",
canvas, x->x_gui.x_obj.te_xpix+ x->x_gui.x_ldx - LABELHANDLE_WIDTH,
x->x_gui.x_obj.te_ypix + x->x_gui.x_ldy - LABELHANDLE_HEIGHT,
LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT,
- lh->h_pathname, x, x);
+ lh->h_pathname, x, x, x);
sys_vgui("bind %s <Button> {pd [concat %s _click 1 %%x %%y \\;]}\n",
lh->h_pathname, lh->h_bindsym->s_name);
sys_vgui("bind %s <ButtonRelease> {pd [concat %s _click 0 0 0 \\;]}\n",
@@ -347,7 +347,7 @@ void vradio_draw_select(t_vradio* x, t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
x->x_gui.scale_vis = 0;
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
x->x_gui.scale_vis = 0;
}
//}
diff --git a/pd/src/g_vslider.c b/pd/src/g_vslider.c
index 14a6ead26..5f20388be 100644
--- a/pd/src/g_vslider.c
+++ b/pd/src/g_vslider.c
@@ -184,7 +184,7 @@ static void vslider_draw_erase(t_vslider* x,t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
/*
sys_vgui(".x%lx.c delete %lxBASE\n", canvas, x);
@@ -305,16 +305,16 @@ static void vslider_draw_select(t_vslider *x, t_glist *glist)
{
if (x->x_gui.label_vis) {
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
- sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxVSLDR}\n",
+ sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxLABELH %lxVSLDR}\n",
canvas, x->x_gui.x_obj.te_xpix+ x->x_gui.x_ldx - LABELHANDLE_WIDTH,
x->x_gui.x_obj.te_ypix + x->x_gui.x_ldy - LABELHANDLE_HEIGHT,
LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT,
- lh->h_pathname, x, x);
+ lh->h_pathname, x, x, x);
sys_vgui("bind %s <Button> {pd [concat %s _click 1 %%x %%y \\;]}\n",
lh->h_pathname, lh->h_bindsym->s_name);
sys_vgui("bind %s <ButtonRelease> {pd [concat %s _click 0 0 0 \\;]}\n",
@@ -336,7 +336,7 @@ static void vslider_draw_select(t_vslider *x, t_glist *glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
x->x_gui.scale_vis = 0;
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
x->x_gui.label_vis = 0;
}
//}
diff --git a/pd/src/g_vumeter.c b/pd/src/g_vumeter.c
index c08794e65..b78ea9891 100644
--- a/pd/src/g_vumeter.c
+++ b/pd/src/g_vumeter.c
@@ -294,7 +294,7 @@ static void vu_draw_erase(t_vu* x,t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
t_scalehandle *lh = (t_scalehandle *)(x->x_gui.x_lhandle);
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
/*
@@ -500,16 +500,16 @@ static void vu_draw_select(t_vu* x,t_glist* glist)
{
if (x->x_gui.label_vis) {
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
- sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxVU}\n",
+ sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxLABEL %lxLABELH %lxVU}\n",
canvas, x->x_gui.x_obj.te_xpix+ x->x_gui.x_ldx - LABELHANDLE_WIDTH,
x->x_gui.x_obj.te_ypix + x->x_gui.x_ldy - LABELHANDLE_HEIGHT,
LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT,
- lh->h_pathname, x, x);
+ lh->h_pathname, x, x, x);
sys_vgui("bind %s <Button> {pd [concat %s _click 1 %%x %%y \\;]}\n",
lh->h_pathname, lh->h_bindsym->s_name);
sys_vgui("bind %s <ButtonRelease> {pd [concat %s _click 0 0 0 \\;]}\n",
@@ -543,7 +543,7 @@ static void vu_draw_select(t_vu* x,t_glist* glist)
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
x->x_gui.scale_vis = 0;
sys_vgui("destroy %s\n", lh->h_pathname);
- sys_vgui(".x%lx.c delete %lxLABEL\n", canvas, x);
+ sys_vgui(".x%lx.c delete %lxLABELH\n", canvas, x);
x->x_gui.label_vis = 0;
}
//}
--
GitLab