comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-08-21 06:22:26 -04:00
Code Issues Projects Releases Wiki Activity

Fix #806: fix scale of Frequency and Edit Label dialogs by @jawatson

Browse Source 
Co-Authored-By: James Watson <jimwatson@mac.com>
This commit is contained in:
vsonnier 2020-04-19 11:17:00 +02:00
parent 2f4e9a9e74
commit b564a0ddde
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/DemodLabelDialog.cpp
View File

@ -30,13 +30,20 @@ DemodLabelDialog::DemodLabelDialog(wxWindow * parent, wxWindowID id, const wxStr
} }
dialogText = new wxTextCtrl(this, wxID_LABEL_INPUT, labelStr, wxPoint(6, 1), wxSize(size.GetWidth() - 20, size.GetHeight() - 70), dialogText = new wxTextCtrl(this, wxID_LABEL_INPUT, labelStr, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
wxTE_PROCESS_ENTER);
dialogText->SetFont(wxFont(15, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD)); dialogText->SetFont(wxFont(15, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
// Set the textControl width to the [title + 100%] or the [content +100%],
// whichever's the greater.
int textCtrlX = dialogText->GetTextExtent(labelStr).GetWidth();
int titleX = this->GetTextExtent(title).GetWidth();
dialogText->SetMinSize(wxSize(max(int(2.0 * titleX), int(2.0 * textCtrlX)), -1));
wxBoxSizer* dialogsizer = new wxBoxSizer(wxALL);
dialogsizer->Add(dialogText, wxSizerFlags(1).Expand().Border(wxALL, 5));
SetSizerAndFit(dialogsizer);
Centre(); Centre();
dialogText->SetValue(labelStr);
dialogText->SetSelection(-1, -1); dialogText->SetSelection(-1, -1);
} }

25
src/FrequencyDialog.cpp
View File

@ -5,6 +5,7 @@
#include "wx/clipbrd.h" #include "wx/clipbrd.h"
#include <sstream> #include <sstream>
#include <algorithm>
#include "CubicSDR.h" #include "CubicSDR.h"
wxBEGIN_EVENT_TABLE(FrequencyDialog, wxDialog) wxBEGIN_EVENT_TABLE(FrequencyDialog, wxDialog)
@ -16,8 +17,6 @@ FrequencyDialog::FrequencyDialog(wxWindow * parent, wxWindowID id, const wxStrin
const wxSize & size, long style, FrequencyDialogTarget targetMode, wxString initString) : const wxSize & size, long style, FrequencyDialogTarget targetMode, wxString initString) :
wxDialog(parent, id, title, wxDefaultPosition, wxDefaultSize, style) { wxDialog(parent, id, title, wxDefaultPosition, wxDefaultSize, style) {
wxString freqStr; wxString freqStr;
wxSizer *dialogsizer = new wxBoxSizer( wxVERTICAL );
int titleX, textCtrlX;
activeDemod = demod; activeDemod = demod;
@ -57,6 +56,18 @@ FrequencyDialog::FrequencyDialog(wxWindow * parent, wxWindowID id, const wxStrin
dialogText = new wxTextCtrl(this, wxID_FREQ_INPUT, freqStr, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER); dialogText = new wxTextCtrl(this, wxID_FREQ_INPUT, freqStr, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER);
dialogText->SetFont(wxFont(15, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD)); dialogText->SetFont(wxFont(15, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
// Set the textControl width to the [title + 100%] or the [content +100%],
// whichever's the greater.
int textCtrlX = dialogText->GetTextExtent(freqStr).GetWidth();
int initTextCtrlX = dialogText->GetTextExtent(initString).GetWidth();
int titleX = this->GetTextExtent(title).GetWidth();
dialogText->SetMinSize(wxSize(max(int(2.0 * titleX), int(2.0 * std::max(textCtrlX, initTextCtrlX))), -1));
wxBoxSizer* dialogsizer = new wxBoxSizer(wxALL);
dialogsizer->Add(dialogText, wxSizerFlags(1).Expand().Border(wxALL, 5));
SetSizerAndFit(dialogsizer);
Centre();
if (initString != "" && initString.length() == 1) { if (initString != "" && initString.length() == 1) {
dialogText->SetValue(initString); dialogText->SetValue(initString);
dialogText->SetSelection(2, 2); dialogText->SetSelection(2, 2);
@ -67,16 +78,6 @@ FrequencyDialog::FrequencyDialog(wxWindow * parent, wxWindowID id, const wxStrin
} }
dialogText->SetSelection(-1, -1); dialogText->SetSelection(-1, -1);
} }
// Set the textControl width to the [title + 35%] or the [content +10%],
// whichever's the greater.
textCtrlX = dialogText->GetTextExtent(initString).GetWidth();
titleX = this->GetTextExtent(title).GetWidth();
dialogText->SetMinSize(wxSize(max(int(1.35 * titleX), int(1.1 * textCtrlX)), -1));
dialogsizer->Add( dialogText, wxSizerFlags(1).Expand().Border(wxALL, 5));
SetSizerAndFit(dialogsizer);
} }