Commit 818b89c2 authored by Ivica Bukvic's avatar Ivica Bukvic
Browse files

fixed all iemgui objects to conform to the new model of gop selection (no...

fixed all iemgui objects to conform to the new model of gop selection (no highlighting of objects inside gop unless they are toplevel objects)
parent 9b595a20
......@@ -244,14 +244,14 @@ void bng_draw_select(t_bng* x, t_glist* glist)
if(x->x_gui.x_fsf.x_selected)
{
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable highlighting
if (x->x_gui.x_glist == glist_getcanvas(glist)) {
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline $select_color\n", canvas, x);
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);
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable drawing of the handles
if (x->x_gui.x_glist == glist_getcanvas(glist)) {
if (x->x_gui.scale_vis)
sys_vgui("destroy %s\n", sh->h_pathname);
......
......@@ -275,16 +275,16 @@ void hradio_draw_select(t_hradio* x, t_glist* glist)
if(x->x_gui.x_fsf.x_selected)
{
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable highlighting
if (x->x_gui.x_glist == glist_getcanvas(glist)) {
for(i=0; i<n; i++)
{
sys_vgui(".x%lx.c itemconfigure %lxBASE%d -outline $select_color\n", canvas, x, i);
}
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill $select_color\n", canvas, x);
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable drawing of the handles
if (x->x_gui.x_glist == glist_getcanvas(glist)) {
if (x->x_gui.scale_vis)
sys_vgui("destroy %s\n", sh->h_pathname);
......
......@@ -261,13 +261,13 @@ static void hslider_draw_select(t_hslider* x,t_glist* glist)
if(x->x_gui.x_fsf.x_selected)
{
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);
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable drawing of the handles
// if so, disable highlighting
if (x->x_gui.x_glist == glist_getcanvas(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)
sys_vgui("destroy %s\n", sh->h_pathname);
......
......@@ -142,12 +142,12 @@ void my_canvas_draw_select(t_my_canvas* x, t_glist* glist)
if(x->x_gui.x_fsf.x_selected)
{
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline $select_color\n", canvas, x);
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable drawing of the handles
// if so, disable highlighting
if (x->x_gui.x_glist == glist_getcanvas(glist)) {
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline $select_color\n", canvas, x);
if (x->x_gui.scale_vis)
sys_vgui("destroy %s\n", sh->h_pathname);
......
......@@ -435,6 +435,11 @@ static void my_numbox_draw_select(t_my_numbox *x, t_glist *glist)
x->x_buf[0] = 0;
sys_queuegui(x, x->x_gui.x_glist, my_numbox_draw_update);
}
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable highlighting
if (x->x_gui.x_glist == glist_getcanvas(glist)) {
sys_vgui(".x%lx.c itemconfigure %lxBASE1 -outline $select_color\n",
canvas, x);
sys_vgui(".x%lx.c itemconfigure %lxBASE2 -fill $select_color\n",
......@@ -444,10 +449,6 @@ 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);
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable drawing of the handles
if (x->x_gui.x_glist == glist_getcanvas(glist)) {
if (x->x_gui.scale_vis)
sys_vgui("destroy %s\n", sh->h_pathname);
......
......@@ -262,13 +262,14 @@ void toggle_draw_select(t_toggle* x, t_glist* glist)
if(x->x_gui.x_fsf.x_selected)
{
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);
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable drawing of the handles
// if so, disable highlighting
if (x->x_gui.x_glist == glist_getcanvas(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)
sys_vgui("destroy %s\n", sh->h_pathname);
......
......@@ -274,16 +274,17 @@ void vradio_draw_select(t_vradio* x, t_glist* glist)
if(x->x_gui.x_fsf.x_selected)
{
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable highlighting
if (x->x_gui.x_glist == glist_getcanvas(glist)) {
for(i=0; i<n; i++)
{
sys_vgui(".x%lx.c itemconfigure %lxBASE%d -outline $select_color\n", canvas, x, i);
}
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill $select_color\n", canvas, x);
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable drawing of the handles
if (x->x_gui.x_glist == glist_getcanvas(glist)) {
if (x->x_gui.scale_vis)
sys_vgui("destroy %s\n", sh->h_pathname);
......
......@@ -252,13 +252,13 @@ static void vslider_draw_select(t_vslider *x, t_glist *glist)
if(x->x_gui.x_fsf.x_selected)
{
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);
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable drawing of the handles
// if so, disable highlighting
if (x->x_gui.x_glist == glist_getcanvas(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)
sys_vgui("destroy %s\n", sh->h_pathname);
......
......@@ -456,6 +456,10 @@ static void vu_draw_select(t_vu* x,t_glist* glist)
if(x->x_gui.x_fsf.x_selected)
{
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable highlighting
if (x->x_gui.x_glist == glist_getcanvas(glist)) {
sys_vgui(".x%lx.c itemconfigure %lxBASE -outline $select_color\n", canvas, x);
for(i=1; i<=IEM_VU_STEPS; i++)
{
......@@ -471,10 +475,6 @@ static void vu_draw_select(t_vu* x,t_glist* glist)
}
sys_vgui(".x%lx.c itemconfigure %lxLABEL -fill $select_color\n", canvas, x);
// check if we are drawing inside a gop abstraction visible on parent canvas
// if so, disable drawing of the handles
if (x->x_gui.x_glist == glist_getcanvas(glist)) {
if (x->x_gui.scale_vis)
sys_vgui("destroy %s\n", sh->h_pathname);
......
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