zynaddsubfx

ZynAddSubFX open source synthesizer
Log | Files | Refs | Submodules | LICENSE

commit ed18baa898e92aec8d2a1ad94e3996c93f0706f8
parent 7d4abc4b892baff6a4b8903420a82346925ae58d
Author: Christopher A. Oliver <caowasteland@gmail.com>
Date:   Fri, 23 Oct 2015 23:53:05 -0400

Set window minimum squinch, and change button text to accomodate it.

Diffstat:
Msrc/UI/EnvelopeUI.fl | 16+++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/UI/EnvelopeUI.fl b/src/UI/EnvelopeUI.fl @@ -106,7 +106,7 @@ delete (freemodeeditwindow);} {} xywh {482 160 15 15} box THIN_UP_BOX color 179 labelfont 1 labelsize 10 labelcolor 55 } Fl_Button addpoint { - label {Add point} + label {Add pt} callback { if(freeedit->lastpoint >= MAX_ENVELOPE_POINTS - 1) return; @@ -118,7 +118,7 @@ sustaincounter->update(); //sustaincounter->value(Penvsustain); //sustaincounter->maximum(Penvpoints-2);} - xywh {115 155 80 20} box THIN_UP_BOX labelsize 11 + xywh {90 155 80 20} box THIN_UP_BOX labelsize 11 code0 {(void)o->init("addPoint");} class PointButton } @@ -130,7 +130,7 @@ sustaincounter->update(); class EnvelopeFreeEdit } Fl_Button deletepoint { - label {Delete point} + label {Delete pt} callback {o->oscWrite("delPoint", "i", freeedit->lastpoint); freeedit->lastpoint-=1; freeedit->update(); @@ -138,7 +138,7 @@ envfree->redraw(); sustaincounter->update(); //sustaincounter->value(Penvsustain); //sustaincounter->maximum(Penvpoints-2);} - xywh {200 155 80 20} box THIN_UP_BOX labelsize 11 + xywh {175 155 85 20} box THIN_UP_BOX labelsize 11 code0 {(void)o->init("delPoint");} class PointButton } @@ -172,7 +172,7 @@ sustaincounter->update(); label Sust callback {freeedit->redraw(); envfree->redraw();} - tooltip {Sustain (0 is disabled)} xywh {315 155 40 15} type Simple labelsize 11 align 4 minimum 0 maximum 127 step 1 + tooltip {Sustain (0 is disabled)} xywh {305 155 40 15} type Simple labelsize 11 align 4 minimum 0 maximum 127 step 1 code3 {o->init("Penvsustain");} class Fl_Osc_Counter } @@ -183,9 +183,10 @@ envfree->redraw();} class Fl_Osc_Check } Fl_Button {} { - label {Cancel Freemode} + label {Cancel} + tooltip {Cancel freemode editing} callback {disable_freemode();} - xywh {5 155 105 20} box THIN_UP_BOX labelsize 11 labelcolor 1 + xywh {5 155 80 20} box THIN_UP_BOX labelsize 11 labelcolor 1 class Fl_Osc_Button } } @@ -534,6 +535,7 @@ envfree->redraw();} freeedit->update(); freemodeeditwindow->show(); freemodeeditwindow->position(Fl::event_x_root()-20, Fl::event_y_root()+20); + freemodeeditwindow->size_range(400,160); } {} } Function {init(int env_type, Fl_Osc_Interface *osc_, std::string base_, std::string ext_)} {open