From 24c0ec27801037fc531e065f00c5e4e114331862 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Fri, 11 Sep 2020 15:29:52 +0200 Subject: [PATCH] Adjust sizes and positions of settings boxes --- editor/layout/main.fl | 46 +++++++++++++++---------------- editor/src/editor/layout/main.hpp | 6 ++-- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/editor/layout/main.fl b/editor/layout/main.fl index 3ad0e0f5..30e3488a 100644 --- a/editor/layout/main.fl +++ b/editor/layout/main.fl @@ -1,12 +1,12 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0305 header_name {.h} code_name {.cxx} widget_class mainView {open xywh {572 266 800 475} type Double class LogicalGroup visible } { - Fl_Box {} {selected + Fl_Box {} { image {../resources/background.png} xywh {190 110 600 280} class Background } @@ -142,7 +142,7 @@ widget_class mainView {open } } Fl_Group {subPanels_[kPanelGeneral]} { - xywh {5 110 791 285} + xywh {5 110 791 285} hide class LogicalGroup } { Fl_Group {} {open @@ -216,95 +216,95 @@ widget_class mainView {open } } } - Fl_Group {subPanels_[kPanelSettings]} { - xywh {5 109 790 286} hide + Fl_Group {subPanels_[kPanelSettings]} {open + xywh {5 109 790 286} class LogicalGroup } { Fl_Group {} { - label Engine open - xywh {260 110 280 110} box ROUNDED_BOX labelsize 12 align 17 + label Engine open selected + xywh {260 135 280 100} box ROUNDED_BOX labelsize 12 align 17 class TitleGroup } { Fl_Spinner numVoicesSlider_ { comment {tag=kTagSetNumVoices} - xywh {285 170 60 25} labelsize 12 textsize 12 + xywh {285 195 60 25} labelsize 12 textsize 12 class ValueMenu } Fl_Box {} { label Polyphony - xywh {275 130 80 25} labelsize 12 + xywh {275 155 80 25} labelsize 12 class ValueLabel } Fl_Spinner oversamplingSlider_ { comment {tag=kTagSetOversampling} - xywh {370 170 60 25} labelsize 12 textsize 12 + xywh {370 195 60 25} labelsize 12 textsize 12 class ValueMenu } Fl_Box {} { label Oversampling - xywh {360 130 80 25} labelsize 12 + xywh {360 155 80 25} labelsize 12 class ValueLabel } Fl_Box {} { label {Preload size} - xywh {445 130 80 25} labelsize 12 + xywh {445 155 80 25} labelsize 12 class ValueLabel } Fl_Spinner preloadSizeSlider_ { comment {tag=kTagSetPreloadSize} - xywh {455 170 60 25} labelsize 12 textsize 12 + xywh {455 195 60 25} labelsize 12 textsize 12 class ValueMenu } } Fl_Group {} { label Tuning open - xywh {205 268 390 120} box ROUNDED_BOX labelsize 12 align 17 + xywh {205 270 390 100} box ROUNDED_BOX labelsize 12 align 17 class TitleGroup } { Fl_Box {} { label {Root key} - xywh {330 288 80 25} labelsize 12 + xywh {330 290 80 25} labelsize 12 class ValueLabel } Fl_Spinner tuningFrequencySlider_ { comment {tag=kTagSetTuningFrequency} - xywh {425 328 60 25} labelsize 12 textsize 12 + xywh {425 330 60 25} labelsize 12 textsize 12 class ValueMenu } Fl_Box {} { label Frequency - xywh {415 288 80 25} labelsize 12 + xywh {415 290 80 25} labelsize 12 class ValueLabel } Fl_Dial stretchedTuningSlider_ { comment {tag=kTagSetStretchedTuning} - xywh {515 313 48 48} value 0.5 + xywh {515 315 48 48} value 0.5 class Knob48 } Fl_Box {} { label Stretch - xywh {500 288 80 25} labelsize 12 + xywh {500 290 80 25} labelsize 12 class ValueLabel } Fl_Box {} { label {Scala file} - xywh {225 288 100 25} labelsize 12 + xywh {225 290 100 25} labelsize 12 class ValueLabel } Fl_Button scalaFileButton_ { label DefaultScale comment {tag=kTagLoadScalaFile} - xywh {225 328 100 25} labelsize 12 + xywh {225 330 100 25} labelsize 12 class ValueButton } Fl_Spinner scalaRootKeySlider_ { comment {tag=kTagSetScalaRootKey} - xywh {340 328 35 25} labelsize 12 textsize 12 + xywh {340 330 35 25} labelsize 12 textsize 12 class ValueMenu } Fl_Spinner scalaRootOctaveSlider_ { comment {tag=kTagSetScalaRootKey} - xywh {375 328 30 25} labelsize 12 textsize 12 + xywh {375 330 30 25} labelsize 12 textsize 12 class ValueMenu } } diff --git a/editor/src/editor/layout/main.hpp b/editor/src/editor/layout/main.hpp index a91fc21c..18a413a5 100644 --- a/editor/src/editor/layout/main.hpp +++ b/editor/src/editor/layout/main.hpp @@ -70,6 +70,7 @@ enterTheme(defaultTheme); LogicalGroup* const view__29 = createLogicalGroup(CRect(5, 110, 796, 395), -1, "", kCenterText, 14); subPanels_[kPanelGeneral] = view__29; view__0->addView(view__29); +view__29->setVisible(false); RoundedGroup* const view__30 = createRoundedGroup(CRect(0, 0, 175, 280), -1, "", kCenterText, 14); view__29->addView(view__30); Label* const view__31 = createLabel(CRect(15, 10, 75, 35), -1, "Curves:", kLeftText, 14); @@ -108,8 +109,7 @@ view__42->addView(view__43); LogicalGroup* const view__44 = createLogicalGroup(CRect(5, 109, 795, 395), -1, "", kCenterText, 14); subPanels_[kPanelSettings] = view__44; view__0->addView(view__44); -view__44->setVisible(false); -TitleGroup* const view__45 = createTitleGroup(CRect(255, 1, 535, 111), -1, "Engine", kCenterText, 12); +TitleGroup* const view__45 = createTitleGroup(CRect(255, 26, 535, 126), -1, "Engine", kCenterText, 12); view__44->addView(view__45); ValueMenu* const view__46 = createValueMenu(CRect(25, 60, 85, 85), kTagSetNumVoices, "", kCenterText, 12); numVoicesSlider_ = view__46; @@ -126,7 +126,7 @@ view__45->addView(view__50); ValueMenu* const view__51 = createValueMenu(CRect(195, 60, 255, 85), kTagSetPreloadSize, "", kCenterText, 12); preloadSizeSlider_ = view__51; view__45->addView(view__51); -TitleGroup* const view__52 = createTitleGroup(CRect(200, 159, 590, 279), -1, "Tuning", kCenterText, 12); +TitleGroup* const view__52 = createTitleGroup(CRect(200, 161, 590, 261), -1, "Tuning", kCenterText, 12); view__44->addView(view__52); ValueLabel* const view__53 = createValueLabel(CRect(125, 20, 205, 45), -1, "Root key", kCenterText, 12); view__52->addView(view__53);