summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Nusser <andre.nusser@googlemail.com>2019-05-12 22:39:34 +0200
committerAndré Nusser <andre.nusser@googlemail.com>2019-05-12 22:39:34 +0200
commit16e2b1c230064788e28930ef27903a5164afa74f (patch)
tree28c76197fbe8d4c145f29ef3363b8e098dad887b
parentf8642113634dc5ab6ffbc1e1d5b79d5be8e579da (diff)
Reorder frames and resize window.
-rw-r--r--plugin/drumgizmo_plugin.h2
-rw-r--r--plugingui/maintab.cc6
-rw-r--r--plugingui/maintab.h2
-rw-r--r--plugingui/testmain.cc4
4 files changed, 7 insertions, 7 deletions
diff --git a/plugin/drumgizmo_plugin.h b/plugin/drumgizmo_plugin.h
index 2f271c6..b422430 100644
--- a/plugin/drumgizmo_plugin.h
+++ b/plugin/drumgizmo_plugin.h
@@ -213,5 +213,5 @@ private:
bool inline_image_first_draw{true};
static constexpr std::size_t width{750};
- static constexpr std::size_t height{733};
+ static constexpr std::size_t height{613};
};
diff --git a/plugingui/maintab.cc b/plugingui/maintab.cc
index 2320c7f..4c8e4d1 100644
--- a/plugingui/maintab.cc
+++ b/plugingui/maintab.cc
@@ -107,8 +107,9 @@ MainTab::MainTab(Widget* parent,
layout.setResizeChildren(true);
add("Drumkit", drumkit_frame, drumkitframe_content, 15, 0);
- add("Status", status_frame, statusframe_content, 24, 0);
- add("Resampling", resampling_frame, resamplingframe_content, 20, 0);
+ add("Status", status_frame, statusframe_content, 15, 0);
+ add("Resampling", resampling_frame, resamplingframe_content, 10, 0);
+ add("Disk Streaming", diskstreaming_frame, diskstreamingframe_content, 9, 0);
add("Velocity Humanizer", humanizer_frame, humanizerframe_content, 10, 1);
humanizer_frame.setHelpText(humanizer_tip);
@@ -120,7 +121,6 @@ MainTab::MainTab(Widget* parent,
add("Visualizer", visualizer_frame, visualizerframe_content, 10, 1);
visualizer_frame.setHelpText(visualizer_tip);
add("Bleed Control", bleedcontrol_frame, bleedcontrolframe_content, 9, 1);
- add("Disk Streaming", diskstreaming_frame, diskstreamingframe_content, 10, 1);
humanizer_frame.setOnSwitch(settings.enable_velocity_modifier);
bleedcontrol_frame.setOnSwitch(settings.enable_bleed_control);
diff --git a/plugingui/maintab.h b/plugingui/maintab.h
index f90d23a..ea46f11 100644
--- a/plugingui/maintab.h
+++ b/plugingui/maintab.h
@@ -66,7 +66,7 @@ private:
Image logo{":resources/logo.png"};
- GridLayout layout{this, 2, 59};
+ GridLayout layout{this, 2, 49};
FrameWidget drumkit_frame{this, false};
FrameWidget status_frame{this, false};
diff --git a/plugingui/testmain.cc b/plugingui/testmain.cc
index 319abf6..b122756 100644
--- a/plugingui/testmain.cc
+++ b/plugingui/testmain.cc
@@ -57,9 +57,9 @@ int main()
// TODO: automatically use drumgizmo_plugin.h size here
#ifndef UI_PUGL
- parent.resize(750, 733);
+ parent.resize(750, 613);
#else
- main_window.resize(750, 733);
+ main_window.resize(750, 613);
#endif
while(true)