summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Nusser <andre.nusser@googlemail.com>2017-04-17 12:53:55 +0200
committerAndré Nusser <andre.nusser@googlemail.com>2017-04-17 12:54:16 +0200
commitce92bea49b5842105c667a613d0043fa0eba2b8f (patch)
tree56b3637db8a25b6c02bc075c92df84823bba614d
parent7cfbb8bfb1c4689dc78115931bab96d657be88be (diff)
Resize frames again to make it look better.
-rw-r--r--plugin/drumgizmo_plugin.cc2
-rw-r--r--plugingui/maintab.cc14
-rw-r--r--plugingui/maintab.h2
-rw-r--r--plugingui/testmain.cc2
4 files changed, 11 insertions, 9 deletions
diff --git a/plugin/drumgizmo_plugin.cc b/plugin/drumgizmo_plugin.cc
index a4a44b8..075724c 100644
--- a/plugin/drumgizmo_plugin.cc
+++ b/plugin/drumgizmo_plugin.cc
@@ -63,7 +63,7 @@ DrumGizmoPlugin::DrumGizmoPlugin()
init();
drumgizmo = std::make_shared<DrumGizmo>(settings, output, input);
- resizeWindow(750, 480);
+ resizeWindow(750, 400);
drumgizmo->setFreeWheel(true);
drumgizmo->setSamplerate(44100);
drumgizmo->setFrameSize(2048);
diff --git a/plugingui/maintab.cc b/plugingui/maintab.cc
index 9b910b8..745557a 100644
--- a/plugingui/maintab.cc
+++ b/plugingui/maintab.cc
@@ -41,12 +41,14 @@ MainTab::MainTab(Widget* parent) : Widget(parent)
layout.addItem(&humanizer_frame);
layout.addItem(&diskstreaming_frame);
- auto h1 = 60;
- auto h2 = 40;
+ auto h1 = 21;
+ auto h2 = 18;
+ auto h3 = 13;
+ auto h4 = 11;
auto drumkit_range = GridLayout::GridRange{0, 1, 0, h1};
- auto status_range = GridLayout::GridRange{0, 1, h1, h1 + 55};
- auto humanizer_range = GridLayout::GridRange{1, 2, 0, h2};
- auto diskstreaming_range = GridLayout::GridRange{1, 2, h2, h2 + 35};
+ auto status_range = GridLayout::GridRange{0, 1, h1, h1 + h2};
+ auto humanizer_range = GridLayout::GridRange{1, 2, 0, h3};
+ auto diskstreaming_range = GridLayout::GridRange{1, 2, h3, h3 + h4};
layout.setPosition(&drumkit_frame, drumkit_range);
layout.setPosition(&status_frame, status_range);
layout.setPosition(&humanizer_frame, humanizer_range);
@@ -66,7 +68,7 @@ MainTab::MainTab(Widget* parent) : Widget(parent)
version_label.setAlignment(TextAlignment::right);
version_label.setColour(Colour(0.1, 0.1, 0.2));
layout.addItem(&version_label);
- layout.setPosition(&version_label, GridLayout::GridRange{1, 2, 31, 32});
+ layout.setPosition(&version_label, GridLayout::GridRange{1, 2, 39, 40});
}
} // GUI::
diff --git a/plugingui/maintab.h b/plugingui/maintab.h
index a30238c..28f8119 100644
--- a/plugingui/maintab.h
+++ b/plugingui/maintab.h
@@ -43,7 +43,7 @@ public:
MainTab(Widget* parent);
private:
- GridLayout layout{this, 2, 128};
+ GridLayout layout{this, 2, 40};
FrameWidget drumkit_frame{this, false};
FrameWidget status_frame{this, false};
diff --git a/plugingui/testmain.cc b/plugingui/testmain.cc
index 5c1a100..d6c3220 100644
--- a/plugingui/testmain.cc
+++ b/plugingui/testmain.cc
@@ -53,7 +53,7 @@ int main()
parent.show();
main_window.show();
- parent.resize(750, 480);
+ parent.resize(750, 400);
while(true)
{