Browse Source

Don't display login form on dev

tags/v0.5.0
Andrew Belt 7 years ago
parent
commit
7bf6aa1beb
1 changed files with 10 additions and 8 deletions
  1. +10
    -8
      src/app/Toolbar.cpp

+ 10
- 8
src/app/Toolbar.cpp View File

@@ -99,8 +99,8 @@ Toolbar::Toolbar() {
float margin = 5; float margin = 5;
box.size.y = BND_WIDGET_HEIGHT + 2*margin; box.size.y = BND_WIDGET_HEIGHT + 2*margin;
float xPos = 0; float xPos = 0;

xPos += margin; xPos += margin;

{ {
ChoiceButton *fileChoice = new FileChoice(); ChoiceButton *fileChoice = new FileChoice();
fileChoice->box.pos = Vec(xPos, margin); fileChoice->box.pos = Vec(xPos, margin);
@@ -109,8 +109,8 @@ Toolbar::Toolbar() {
addChild(fileChoice); addChild(fileChoice);
xPos += fileChoice->box.size.x; xPos += fileChoice->box.size.x;
} }

xPos += margin; xPos += margin;

{ {
SampleRateChoice *srChoice = new SampleRateChoice(); SampleRateChoice *srChoice = new SampleRateChoice();
srChoice->box.pos = Vec(xPos, margin); srChoice->box.pos = Vec(xPos, margin);
@@ -118,8 +118,8 @@ Toolbar::Toolbar() {
addChild(srChoice); addChild(srChoice);
xPos += srChoice->box.size.x; xPos += srChoice->box.size.x;
} }

xPos += margin; xPos += margin;

{ {
wireOpacitySlider = new Slider(); wireOpacitySlider = new Slider();
wireOpacitySlider->box.pos = Vec(xPos, margin); wireOpacitySlider->box.pos = Vec(xPos, margin);
@@ -132,8 +132,8 @@ Toolbar::Toolbar() {
addChild(wireOpacitySlider); addChild(wireOpacitySlider);
xPos += wireOpacitySlider->box.size.x; xPos += wireOpacitySlider->box.size.x;
} }

xPos += margin; xPos += margin;

{ {
wireTensionSlider = new Slider(); wireTensionSlider = new Slider();
wireTensionSlider->box.pos = Vec(xPos, margin); wireTensionSlider->box.pos = Vec(xPos, margin);
@@ -145,8 +145,8 @@ Toolbar::Toolbar() {
addChild(wireTensionSlider); addChild(wireTensionSlider);
xPos += wireTensionSlider->box.size.x; xPos += wireTensionSlider->box.size.x;
} }

xPos += margin; xPos += margin;

{ {
struct ZoomSlider : Slider { struct ZoomSlider : Slider {
void onAction(EventAction &e) override { void onAction(EventAction &e) override {
@@ -164,8 +164,8 @@ Toolbar::Toolbar() {
addChild(zoomSlider); addChild(zoomSlider);
xPos += zoomSlider->box.size.x; xPos += zoomSlider->box.size.x;
} }

xPos += margin; xPos += margin;

{ {
plugLightButton = new RadioButton(); plugLightButton = new RadioButton();
plugLightButton->box.pos = Vec(xPos, margin); plugLightButton->box.pos = Vec(xPos, margin);
@@ -174,9 +174,9 @@ Toolbar::Toolbar() {
addChild(plugLightButton); addChild(plugLightButton);
xPos += plugLightButton->box.size.x; xPos += plugLightButton->box.size.x;
} }
xPos += margin;


/* /*
xPos += margin;
{ {
cpuUsageButton = new RadioButton(); cpuUsageButton = new RadioButton();
cpuUsageButton->box.pos = Vec(xPos, margin); cpuUsageButton->box.pos = Vec(xPos, margin);
@@ -185,15 +185,17 @@ Toolbar::Toolbar() {
addChild(cpuUsageButton); addChild(cpuUsageButton);
xPos += cpuUsageButton->box.size.x; xPos += cpuUsageButton->box.size.x;
} }
xPos += margin;
*/ */


xPos += margin;
#ifdef VERSION
{ {
Widget *pluginManager = new PluginManagerWidget(); Widget *pluginManager = new PluginManagerWidget();
pluginManager->box.pos = Vec(xPos, margin); pluginManager->box.pos = Vec(xPos, margin);
addChild(pluginManager); addChild(pluginManager);
xPos += pluginManager->box.size.x; xPos += pluginManager->box.size.x;
} }
#endif
} }


void Toolbar::draw(NVGcontext *vg) { void Toolbar::draw(NVGcontext *vg) {


Loading…
Cancel
Save