zynaddsubfx

commit b836976d387bef5499f70fc8c8ad3a638df3da10
parent fa7c78b703486e842e418a7d1a723155bb09239e
Author: fundamental <[email protected]>
Date:   Sat, 21 Feb 2015 13:47:49 -0500

UI: Fix SimpleUI Rebase Issue

Diffstat:
M
src/UI/Fl_Osc_Dial.cpp
 | 
2
+-
M
src/UI/MasterUI.fl
 | 
6
+++---

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/UI/Fl_Osc_Dial.cpp b/src/UI/Fl_Osc_Dial.cpp
@@ -96,7 +96,7 @@ void Fl_Osc_Dial::mark_dead(void)
         
 void Fl_Osc_Dial::rebase(std::string new_base)
 {
-    if(dead)
+    if(dead || loc == "/")
         return;
     if(!alt_style) {
         Fl_Osc_Widget::rebase(new_base);
diff --git a/src/UI/MasterUI.fl b/src/UI/MasterUI.fl
@@ -1145,8 +1145,8 @@ o->redraw();}
 /*simplesysefftype->value(master->sysefx[nsyseff]->geteffect());*/
 simplesyseffectui->refresh();
 simplesysefftype->oscMove("sysefx"+to_s(nsyseff)+"/efftype");
-simplesyseffectuigroup->rebase("sysefx"+to_s(nsyseff));
-simplesyseffsend->oscMove("/","Psysefxvol"+to_s(nsyseff)+"/part"+to_s(npart));
+simplesyseffectuigroup->reext("sysefx"+to_s(nsyseff)+"/");
+simplesyseffsend->oscMove("Psysefxvol"+to_s(nsyseff)+"/part"+to_s(npart));
 simplerefresh();}
               xywh {350 75 80 20} type Simple labelfont 1 labelsize 10 align 1 minimum 0 maximum 127 step 1 value 1 textfont 1
               code0 {o->bounds(1,NUM_SYS_EFX);}
@@ -1388,7 +1388,7 @@ simpleglobalfinedetuneslider->do_callback();}
 npartcounter->value(o->value());
 npart=(int) o->value()-1;
 
-simplelistitemgroup->rebase("part"+to_s(npart)+"/");
+simplelistitemgroup->reext("part"+to_s(npart)+"/");
 partenabled->oscMove("part"+to_s(npart)+"/Penabled");
 simplerefresh();}
         tooltip {The part number} xywh {170 40 70 20} type Simple labelfont 1 align 4 minimum 0 maximum 127 step 1 value 1 textfont 1