From 75be125fb0f50a8e4e766ca70f15b5822c0076e2 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 25 Apr 2020 22:38:03 +0200 Subject: WIP: Adjust layout --- plugingui/maintab.cc | 12 ++++++------ plugingui/powerwidget.cc | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plugingui/maintab.cc b/plugingui/maintab.cc index d425583..9f0024e 100644 --- a/plugingui/maintab.cc +++ b/plugingui/maintab.cc @@ -111,10 +111,11 @@ MainTab::MainTab(Widget* parent, layout.setSpacing(0); layout.setResizeChildren(true); - add("Drumkit", drumkit_frame, drumkitframe_content, 15, 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("Drumkit", drumkit_frame, drumkitframe_content, 12, 0); + add("Status", status_frame, statusframe_content, 14, 0); + add("Resampling", resampling_frame, resamplingframe_content, 9, 0); + add("Disk Streaming", diskstreaming_frame, diskstreamingframe_content, 7, 0); + add("Bleed Control", bleedcontrol_frame, bleedcontrolframe_content, 7, 0); add("Velocity Humanizer", humanizer_frame, humanizerframe_content, 8, 1); humanizer_frame.setHelpText(humanizer_tip); @@ -125,9 +126,8 @@ MainTab::MainTab(Widget* parent, sampleselection_frame.setHelpText(sampleselection_tip); add("Visualizer", visualizer_frame, visualizerframe_content, 8, 1); visualizer_frame.setHelpText(visualizer_tip); - add("Velocity Curve", power_frame, powerframe_content, 9, 1); + add("Velocity Curve", power_frame, powerframe_content, 17, 1); power_frame.setHelpText(power_tip); - add("Bleed Control", bleedcontrol_frame, bleedcontrolframe_content, 8, 1); humanizer_frame.setOnSwitch(settings.enable_velocity_modifier); bleedcontrol_frame.setOnSwitch(settings.enable_bleed_control); diff --git a/plugingui/powerwidget.cc b/plugingui/powerwidget.cc index 560a5d3..e7c8e60 100644 --- a/plugingui/powerwidget.cc +++ b/plugingui/powerwidget.cc @@ -64,7 +64,7 @@ void PowerWidget::chk_shelf(bool v) void PowerWidget::repaintEvent(GUI::RepaintEvent *repaintEvent) { GUI::Painter p(*this); - box.setSize(width() - 59, height()); + box.setSize(width() - 59 - 64, height()); p.drawImage(0, 0, box); } @@ -76,10 +76,10 @@ void PowerWidget::resize(std::size_t width, std::size_t height) canvas.resize(1, 1); return; } - canvas.resize(width - 14 - 59, height - 14); + canvas.resize(width - 14 - 59 - 64, height - 14); - shelf_label.move(width - 59 + 5, 0); - shelf_checkbox.move(width - 59 + 5, 16); + shelf_label.move(width - 59 + 5 - 32 , 0); + shelf_checkbox.move(width - 59 + 5 - 32, 16); } PowerWidget::Canvas::Canvas(GUI::Widget* parent, -- cgit v1.2.3