Skip to content
GitLab
Commit d7eee9c5 authored by Ivica Bukvic's avatar Ivica Bukvic
Browse files

removed stale resize hooks that messed with the scrolling algorithm

parent 2614228b
Hide whitespace changes
Inline Side-by-side
pd/src/g_bang.c
View file @ d7eee9c5
......@@ -155,8 +155,10 @@ void bng_draw_erase(t_bng* x, t_glist* glist)
if (x->x_gui.x_fsf.x_selected) {
t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
sys_vgui("destroy %s\n", sh->h_pathname);
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 %lxBASE\n", canvas, x);
......@@ -252,8 +254,10 @@ void bng_draw_select(t_bng* x, t_glist* glist)
sys_vgui(".x%lx.c itemconfigure %lxBUT -outline $select_color\n", canvas, x);
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill $select_color\n", canvas, x);
if (x->x_gui.scale_vis)
if (x->x_gui.scale_vis) {
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor bottom_right_corner\n",
sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
......@@ -272,8 +276,10 @@ void bng_draw_select(t_bng* x, t_glist* glist)
if (strcmp(x->x_gui.x_lab->s_name, "empty") != 0)
{
if (x->x_gui.label_vis)
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("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
......@@ -301,8 +307,10 @@ void bng_draw_select(t_bng* x, t_glist* glist)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol);
sys_vgui(".x%lx.c dtag %lxBNG selected\n", canvas, x);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
x->x_gui.label_vis = 0;
}
//}
......@@ -359,7 +367,6 @@ static void bng__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx, t_fl
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
bng_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......@@ -409,7 +416,6 @@ static void bng__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx, t_fl
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
bng_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......
pd/src/g_canvas.c
View file @ d7eee9c5
......@@ -683,12 +683,15 @@ void canvas_dirty(t_canvas *x, t_floatarg n)
/*********** dpsaha@vt.edu resize move hooks ****************/
void canvas_draw_gop_resize_hooks(t_canvas* x)
{
t_scalehandle *sh = (t_scalehandle *)(x->x_handle);
t_scalehandle *mh = (t_scalehandle *)(x->x_mhandle);
if(x->gl_edit && glist_isvisible(x) && glist_istoplevel(x) && x->gl_goprect && !x->gl_editor->e_selection) {
//Drawing and Binding Resize_Blob for GOP
t_scalehandle *sh = (t_scalehandle *)(x->x_handle);
sprintf(sh->h_pathname, ".x%lx.h%lx", (t_int)x, (t_int)sh);
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui(".x%lx.c delete GOP_resblob\n", x);
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor bottom_right_corner\n",
sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxSCALE %lxGOP GOP_resblob}\n",
......@@ -705,9 +708,9 @@ void canvas_draw_gop_resize_hooks(t_canvas* x)
sh->h_pathname, sh->h_bindsym->s_name);
//Drawing and Binding Move_Blob for GOP
t_scalehandle *mh = (t_scalehandle *)(x->x_mhandle);
sprintf(mh->h_pathname, ".x%lx.h%lx", (t_int)x, (t_int)mh);
sys_vgui("destroy %s\n", mh->h_pathname);
sys_vgui("destroy %s\n", mh->h_pathname);
sys_vgui(".x%lx.c delete GOP_movblob\n", x);
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
mh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
sys_vgui(".x%x.c create window %d %d -anchor nw -width %d -height %d -window %s -tags {%lxMOVE %lxGOP GOP_movblob}\n",
......@@ -725,6 +728,8 @@ void canvas_draw_gop_resize_hooks(t_canvas* x)
}
else{
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui("destroy %s\n", mh->h_pathname);
sys_vgui(".x%lx.c delete GOP_resblob ; .x%lx.c delete GOP_movblob ;\n", x, x); //delete the GOP_resblob and GOP_movblob
}
}
......
pd/src/g_hdial.c
View file @ d7eee9c5
......@@ -174,8 +174,10 @@ void hradio_draw_erase(t_hradio* x, t_glist* glist)
if (x->x_gui.x_fsf.x_selected) {
t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
}
/*
for(i=0; i<n; i++)
......@@ -285,8 +287,10 @@ void hradio_draw_select(t_hradio* x, t_glist* glist)
}
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill $select_color\n", canvas, x);
if (x->x_gui.scale_vis)
if (x->x_gui.scale_vis) {
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor bottom_right_corner\n",
sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
......@@ -304,8 +308,10 @@ void hradio_draw_select(t_hradio* x, t_glist* glist)
x->x_gui.scale_vis = 1;
if (strcmp(x->x_gui.x_lab->s_name, "empty") != 0)
{
if (x->x_gui.label_vis)
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("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
......@@ -337,8 +343,10 @@ void hradio_draw_select(t_hradio* x, t_glist* glist)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n", canvas, x,
x->x_gui.x_lcol);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
x->x_gui.label_vis = 0;
}
//}
......@@ -393,7 +401,6 @@ static void hradio__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx, t
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
hradio_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......@@ -443,7 +450,6 @@ static void hradio__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx, t
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
hradio_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......
pd/src/g_hslider.c
View file @ d7eee9c5
......@@ -178,8 +178,10 @@ static void hslider_draw_erase(t_hslider* x,t_glist* glist)
if (x->x_gui.x_fsf.x_selected) {
t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
sys_vgui("destroy %s\n", sh->h_pathname);
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 %lxBASE\n", canvas, x);
......@@ -271,8 +273,10 @@ static void hslider_draw_select(t_hslider* x,t_glist* glist)
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline $select_color\n", canvas, x);
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill $select_color\n", canvas, x);
if (x->x_gui.scale_vis)
if (x->x_gui.scale_vis) {
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor bottom_right_corner\n",
sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
......@@ -291,8 +295,10 @@ static void hslider_draw_select(t_hslider* x,t_glist* glist)
if (strcmp(x->x_gui.x_lab->s_name, "empty") != 0)
{
if (x->x_gui.label_vis)
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("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
......@@ -319,8 +325,10 @@ static void hslider_draw_select(t_hslider* x,t_glist* glist)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol);
sys_vgui(".x%lx.c dtag %lxHSLDR selected\n", canvas, x);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
x->x_gui.label_vis = 0;
}
//}
......@@ -382,7 +390,6 @@ static void hslider__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx,
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
hslider_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......@@ -432,7 +439,6 @@ static void hslider__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx,
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
hslider_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......
pd/src/g_mycanvas.c
View file @ d7eee9c5
......@@ -99,8 +99,10 @@ void my_canvas_draw_erase(t_my_canvas* x, t_glist* glist)
if (x->x_gui.x_fsf.x_selected) {
t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
sys_vgui("destroy %s\n", sh->h_pathname);
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 %lxBASE\n", canvas, x);
//sys_vgui(".x%lx.c delete %lxRECT\n", canvas, x);
......@@ -148,8 +150,10 @@ void my_canvas_draw_select(t_my_canvas* x, t_glist* glist)
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline $select_color\n", canvas, x);
if (x->x_gui.scale_vis)
if (x->x_gui.scale_vis) {
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor bottom_right_corner\n",
sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
......@@ -168,8 +172,10 @@ void my_canvas_draw_select(t_my_canvas* x, t_glist* glist)
if (strcmp(x->x_gui.x_lab->s_name, "empty") != 0)
{
if (x->x_gui.label_vis)
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("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
......@@ -195,8 +201,10 @@ void my_canvas_draw_select(t_my_canvas* x, t_glist* glist)
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline #%6.6x\n", canvas, x, x->x_gui.x_bcol);
sys_vgui(".x%lx.c dtag %lxMYCNV selected\n", canvas, x);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
x->x_gui.label_vis = 0;
}
//}
......@@ -255,7 +263,6 @@ static void my_canvas__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
my_canvas_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......@@ -304,7 +311,6 @@ static void my_canvas__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx
if (glist_isvisible(x->x_gui.x_glist))
{
my_canvas_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......
pd/src/g_numbox.c
View file @ d7eee9c5
......@@ -332,8 +332,10 @@ static void my_numbox_draw_erase(t_my_numbox* x,t_glist* glist)
if (x->x_gui.x_fsf.x_selected) {
t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
sys_vgui("destroy %s\n", sh->h_pathname);
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 %lxBASE1\n", canvas, x);
......@@ -465,8 +467,10 @@ static void my_numbox_draw_select(t_my_numbox *x, t_glist *glist)
sys_vgui(".x%lx.c itemconfigure %lxNUMBER -fill $select_color\n",
canvas, x);
if (x->x_gui.scale_vis)
if (x->x_gui.scale_vis) {
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor bottom_right_corner\n",
sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
......@@ -484,8 +488,10 @@ static void my_numbox_draw_select(t_my_numbox *x, t_glist *glist)
x->x_gui.scale_vis = 1;
if (strcmp(x->x_gui.x_lab->s_name, "empty") != 0)
{
if (x->x_gui.label_vis)
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("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
......@@ -523,8 +529,10 @@ static void my_numbox_draw_select(t_my_numbox *x, t_glist *glist)
sys_vgui(".x%lx.c itemconfigure %lxNUMBER -fill #%6.6x\n",
canvas, x, x->x_gui.x_fcol);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
x->x_gui.label_vis = 0;
}
//}
......@@ -580,7 +588,6 @@ static void my_numbox__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx
my_numbox_draw_move(x, x->x_gui.x_glist);
my_numbox_draw_config(x, x->x_gui.x_glist);
my_numbox_draw_update((t_gobj*)x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......@@ -633,7 +640,6 @@ static void my_numbox__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
my_numbox_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......
pd/src/g_toggle.c
View file @ d7eee9c5
......@@ -160,8 +160,10 @@ void toggle_draw_erase(t_toggle* x, t_glist* glist)
if (x->x_gui.x_fsf.x_selected) {
t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
sys_vgui("destroy %s\n", sh->h_pathname);
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 %lxBASE\n", canvas, x);
......@@ -270,8 +272,10 @@ void toggle_draw_select(t_toggle* x, t_glist* glist)
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline $select_color\n", canvas, x);
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill $select_color\n", canvas, x);
if (x->x_gui.scale_vis)
if (x->x_gui.scale_vis) {
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor bottom_right_corner\n",
sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
......@@ -290,8 +294,10 @@ void toggle_draw_select(t_toggle* x, t_glist* glist)
if (strcmp(x->x_gui.x_lab->s_name, "empty") != 0)
{
if (x->x_gui.label_vis)
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("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
......@@ -318,8 +324,10 @@ void toggle_draw_select(t_toggle* x, t_glist* glist)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol);
sys_vgui(".x%lx.c dtag %lxTGL selected\n", canvas, x);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
x->x_gui.label_vis = 0;
}
//}
......@@ -376,7 +384,6 @@ static void toggle__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx, t
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
toggle_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......@@ -426,7 +433,6 @@ static void toggle__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx, t
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
toggle_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......
pd/src/g_vdial.c
View file @ d7eee9c5
......@@ -172,8 +172,10 @@ void vradio_draw_erase(t_vradio* x, t_glist* glist)
if (x->x_gui.x_fsf.x_selected) {
t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
}
/*
......@@ -285,8 +287,10 @@ void vradio_draw_select(t_vradio* x, t_glist* glist)
}
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill $select_color\n", canvas, x);
if (x->x_gui.scale_vis)
if (x->x_gui.scale_vis) {
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor bottom_right_corner\n",
sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
......@@ -305,8 +309,10 @@ void vradio_draw_select(t_vradio* x, t_glist* glist)
if (strcmp(x->x_gui.x_lab->s_name, "empty") != 0)
{
if (x->x_gui.label_vis)
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("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
......@@ -338,8 +344,10 @@ void vradio_draw_select(t_vradio* x, t_glist* glist)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n", canvas, x,
x->x_gui.x_lcol);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
x->x_gui.scale_vis = 0;
}
//}
......@@ -394,7 +402,6 @@ static void vradio__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx, t
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
vradio_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......@@ -444,7 +451,6 @@ static void vradio__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx, t
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
vradio_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......
pd/src/g_vslider.c
View file @ d7eee9c5
......@@ -181,8 +181,10 @@ static void vslider_draw_erase(t_vslider* x,t_glist* glist)
if (x->x_gui.x_fsf.x_selected) {
t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
sys_vgui("destroy %s\n", sh->h_pathname);
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 %lxBASE\n", canvas, x);
......@@ -279,8 +281,10 @@ static void vslider_draw_select(t_vslider *x, t_glist *glist)
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline $select_color\n", canvas, x);
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill $select_color\n", canvas, x);
if (x->x_gui.scale_vis)
if (x->x_gui.scale_vis) {
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor bottom_right_corner\n",
sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
......@@ -299,8 +303,10 @@ static void vslider_draw_select(t_vslider *x, t_glist *glist)
if (strcmp(x->x_gui.x_lab->s_name, "empty") != 0)
{
if (x->x_gui.label_vis)
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("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
......@@ -327,8 +333,10 @@ static void vslider_draw_select(t_vslider *x, t_glist *glist)
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol);
sys_vgui(".x%lx.c dtag %lxVSLDR selected\n", canvas, x);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
x->x_gui.label_vis = 0;
}
//}
......@@ -390,7 +398,6 @@ static void vslider__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx,
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
vslider_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......@@ -440,7 +447,6 @@ static void vslider__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx,
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
vslider_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......
pd/src/g_vumeter.c
View file @ d7eee9c5
......@@ -291,8 +291,10 @@ static void vu_draw_erase(t_vu* x,t_glist* glist)
if (x->x_gui.x_fsf.x_selected) {
t_scalehandle *sh = (t_scalehandle *)(x->x_gui.x_handle);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
}
/*
......@@ -475,8 +477,10 @@ static void vu_draw_select(t_vu* x,t_glist* glist)
}
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill $select_color\n", canvas, x);
if (x->x_gui.scale_vis)
if (x->x_gui.scale_vis) {
sys_vgui("destroy %s\n", sh->h_pathname);
sys_vgui(".x%lx.c delete %lxSCALE\n", canvas, x);
}
sys_vgui("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor bottom_right_corner\n",
sh->h_pathname, SCALEHANDLE_WIDTH, SCALEHANDLE_HEIGHT);
......@@ -494,8 +498,10 @@ static void vu_draw_select(t_vu* x,t_glist* glist)
x->x_gui.scale_vis = 1;
if (strcmp(x->x_gui.x_lab->s_name, "empty") != 0)
{
if (x->x_gui.label_vis)
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("canvas %s -width %d -height %d -bg $select_color -bd 0 -cursor crosshair\n",
lh->h_pathname, LABELHANDLE_WIDTH, LABELHANDLE_HEIGHT);
......@@ -534,8 +540,10 @@ static void vu_draw_select(t_vu* x,t_glist* glist)
}
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill #%6.6x\n", canvas, x, x->x_gui.x_lcol);
sys_vgui("destroy %s\n", sh->h_pathname);
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);
x->x_gui.label_vis = 0;
}
//}
......@@ -591,7 +599,6 @@ static void vu__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx, t_flo
vu_draw_move(x, x->x_gui.x_glist);
vu_draw_config(x, x->x_gui.x_glist);
vu_draw_update((t_gobj *)x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......@@ -641,7 +648,6 @@ static void vu__clickhook(t_scalehandle *sh, t_floatarg f, t_floatarg xxx, t_flo
{
sys_vgui(".x%x.c delete %s\n", x->x_gui.x_glist, sh->h_outlinetag);
vu_draw_move(x, x->x_gui.x_glist);
sys_vgui("destroy %s\n", sh->h_pathname);
iemgui_select((t_gobj *)x, x->x_gui.x_glist, 1);
canvas_fixlinesfor(x->x_gui.x_glist, (t_text *)x);
sys_vgui("pdtk_canvas_getscroll .x%lx.c\n", x->x_gui.x_glist);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment