From 058709b8a85f2211e69ee2cf5f2797f9bc0f92e0 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Fri, 30 Oct 2015 19:46:29 -0400 Subject: [PATCH] Balance some interactive UI elements to scale better MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Most notably the tuning bar wasn’t really usable before when reducing the top area too much. --- src/AppFrame.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp index 9af3afe..ad5f82a 100644 --- a/src/AppFrame.cpp +++ b/src/AppFrame.cpp @@ -101,8 +101,10 @@ AppFrame::AppFrame() : demodSignalMeter = new MeterCanvas(demodPanel, attribList); demodSignalMeter->setMax(0.5); demodSignalMeter->setHelpTip("Current Signal Level. Click / Drag to set Squelch level."); + demodSignalMeter->SetMinSize(wxSize(12,24)); demodTray->Add(demodSignalMeter, 1, wxEXPAND | wxALL, 0); + demodTray->AddSpacer(1); scopeCanvas = new ScopeCanvas(demodPanel, attribList); @@ -115,6 +117,7 @@ AppFrame::AppFrame() : demodTuner = new TuningCanvas(demodPanel, attribList); demodTuner->setHelpTip("Testing tuner"); + demodTuner->SetMinClientSize(wxSize(200,24)); demodScopeTray->Add(demodTuner, 1, wxEXPAND | wxALL, 0); demodTray->Add(demodScopeTray, 30, wxEXPAND | wxALL, 0); @@ -127,8 +130,10 @@ AppFrame::AppFrame() : demodGainMeter->setMax(2.0); demodGainMeter->setHelpTip("Current Demodulator Gain Level. Click / Drag to set Gain level."); demodGainMeter->setShowUserInput(false); + demodGainMeter->SetMinSize(wxSize(12,24)); demodGainTray->Add(demodGainMeter, 8, wxEXPAND | wxALL, 0); + demodGainTray->AddSpacer(1); demodMuteButton = new ModeSelectorCanvas(demodPanel, attribList); @@ -138,7 +143,8 @@ AppFrame::AppFrame() : demodMuteButton->setHelpTip("Demodulator Mute Toggle"); demodMuteButton->setToggleMode(true); demodMuteButton->setSelection(-1); - + demodMuteButton->SetMinSize(wxSize(12,24)); + demodGainTray->Add(demodMuteButton, 1, wxEXPAND | wxALL, 0); demodTray->Add(demodGainTray, 1, wxEXPAND | wxALL, 0); @@ -168,6 +174,8 @@ AppFrame::AppFrame() : spectrumAvgMeter->setMax(1.0); spectrumAvgMeter->setLevel(0.65); spectrumAvgMeter->setShowUserInput(false); + spectrumAvgMeter->SetMinSize(wxSize(12,24)); + spectrumSizer->Add(spectrumCanvas, 63, wxEXPAND | wxALL, 0); spectrumSizer->AddSpacer(1); @@ -196,6 +204,7 @@ AppFrame::AppFrame() : waterfallSpeedMeter->setMax(sqrt(1024)); waterfallSpeedMeter->setLevel(sqrt(DEFAULT_WATERFALL_LPS)); waterfallSpeedMeter->setShowUserInput(false); + waterfallSpeedMeter->SetMinSize(wxSize(12,24)); wfSizer->Add(waterfallCanvas, 63, wxEXPAND | wxALL, 0); wfSizer->AddSpacer(1);