Skip to content

Commit

Permalink
Prevent right panels from being too small. Equal row distances in dis…
Browse files Browse the repository at this point in the history 
…playmetrics panel.
  • Loading branch information
larspalo committed May 16, 2024
1 parent 2d2eab1 commit fb79300
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 15 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Tools->Parse Legacy X-fades option naming to Import Legacy X-fades and to act directly on the currently open organ file.
- Size of right side panels to have an uniform minimum size.
- All row distances in displaymetrics panel are equal.

### Fixed

Expand Down
28 changes: 14 additions & 14 deletions src/DisplayMetricsPanel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ DisplayMetricsPanel::DisplayMetricsPanel(wxWindow *parent) : wxPanel(parent) {
wxString woodNumber = wxString::Format(wxT("%d"), i + 1);
m_drawstopBackground->Append(woodNumber, ::wxGetApp().m_scaledWoodBitmaps[i]);
}
secondRow->Add(m_drawstopBackground, 1, wxEXPAND, 0);
secondRow->Add(m_drawstopBackground, 1, wxEXPAND|wxALL, 5);
wxStaticText *consoleBgText = new wxStaticText(
this,
wxID_STATIC,
Expand All @@ -175,8 +175,8 @@ DisplayMetricsPanel::DisplayMetricsPanel(wxWindow *parent) : wxPanel(parent) {
wxString woodNumber = wxString::Format(wxT("%d"), i + 1);
m_consoleBackground->Append(woodNumber, ::wxGetApp().m_scaledWoodBitmaps[i]);
}
secondRow->Add(m_consoleBackground, 1, wxEXPAND, 0);
panelSizer->Add(secondRow, 1, wxEXPAND);
secondRow->Add(m_consoleBackground, 1, wxEXPAND|wxALL, 5);
panelSizer->Add(secondRow, 1, wxEXPAND, 0);

wxBoxSizer *thirdRow = new wxBoxSizer(wxHORIZONTAL);
wxStaticText *keyHorizBgText = new wxStaticText (
Expand All @@ -193,7 +193,7 @@ DisplayMetricsPanel::DisplayMetricsPanel(wxWindow *parent) : wxPanel(parent) {
wxString woodNumber = wxString::Format(wxT("%d"), i + 1);
m_keyHorizBackground->Append(woodNumber, ::wxGetApp().m_scaledWoodBitmaps[i]);
}
thirdRow->Add(m_keyHorizBackground, 1, wxEXPAND, 0);
thirdRow->Add(m_keyHorizBackground, 1, wxEXPAND|wxALL, 5);
wxStaticText *keyVertBgText = new wxStaticText (
this,
wxID_STATIC,
Expand All @@ -208,7 +208,7 @@ DisplayMetricsPanel::DisplayMetricsPanel(wxWindow *parent) : wxPanel(parent) {
wxString woodNumber = wxString::Format(wxT("%d"), i + 1);
m_keyVertBackground->Append(woodNumber, ::wxGetApp().m_scaledWoodBitmaps[i]);
}
thirdRow->Add(m_keyVertBackground, 1, wxEXPAND, 0);
thirdRow->Add(m_keyVertBackground, 1, wxEXPAND|wxALL, 5);
wxStaticText *drawstopInsetBgText = new wxStaticText (
this,
wxID_STATIC,
Expand All @@ -223,8 +223,8 @@ DisplayMetricsPanel::DisplayMetricsPanel(wxWindow *parent) : wxPanel(parent) {
wxString woodNumber = wxString::Format(wxT("%d"), i + 1);
m_drawstopInsetBackground->Append(woodNumber, ::wxGetApp().m_scaledWoodBitmaps[i]);
}
thirdRow->Add(m_drawstopInsetBackground, 1, wxEXPAND, 0);
panelSizer->Add(thirdRow, 0, wxGROW);
thirdRow->Add(m_drawstopInsetBackground, 1, wxEXPAND|wxALL, 5);
panelSizer->Add(thirdRow, 1, wxEXPAND|wxALL, 0);

wxBoxSizer *fourthRow = new wxBoxSizer(wxHORIZONTAL);
wxStaticText *controlFontText = new wxStaticText(
Expand All @@ -237,7 +237,7 @@ DisplayMetricsPanel::DisplayMetricsPanel(wxWindow *parent) : wxPanel(parent) {
this,
ID_CTRL_LABEL_FONT
);
fourthRow->Add(m_controlLabelFont, 1, wxEXPAND, 0);
fourthRow->Add(m_controlLabelFont, 1, wxEXPAND|wxALL, 5);
wxStaticText *groupFontText = new wxStaticText(
this,
wxID_STATIC,
Expand All @@ -248,8 +248,8 @@ DisplayMetricsPanel::DisplayMetricsPanel(wxWindow *parent) : wxPanel(parent) {
this,
ID_GROUP_LABEL_FONT
);
fourthRow->Add(m_groupLabelFont, 1, wxEXPAND, 0);
panelSizer->Add(fourthRow, 1, wxEXPAND);
fourthRow->Add(m_groupLabelFont, 1, wxEXPAND|wxALL, 5);
panelSizer->Add(fourthRow, 0, wxEXPAND);

wxBoxSizer *fifthRow = new wxBoxSizer(wxHORIZONTAL);
wxStaticText *shortcutFontText = new wxStaticText(
Expand All @@ -262,7 +262,7 @@ DisplayMetricsPanel::DisplayMetricsPanel(wxWindow *parent) : wxPanel(parent) {
this,
ID_SHORTCUT_KEY_LABEL_FONT
);
fifthRow->Add(m_shortcutKeyLabelFont, 1, wxEXPAND, 0);
fifthRow->Add(m_shortcutKeyLabelFont, 1, wxEXPAND|wxALL, 5);
wxStaticText *shortcutColourText = new wxStaticText(
this,
wxID_STATIC,
Expand All @@ -276,13 +276,13 @@ DisplayMetricsPanel::DisplayMetricsPanel(wxWindow *parent) : wxPanel(parent) {
wxDefaultSize,
m_colors
);
fifthRow->Add(m_shortcutKeyLabelColour, 1, wxEXPAND, 0);
fifthRow->Add(m_shortcutKeyLabelColour, 1, wxEXPAND|wxALL, 5);
m_shortcutKeyColourPick = new wxColourPickerCtrl(
this,
ID_SHORTCUT_COLOUR_PICKER
);
fifthRow->Add(m_shortcutKeyColourPick, 1, wxEXPAND, 0);
panelSizer->Add(fifthRow, 1, wxEXPAND);
fifthRow->Add(m_shortcutKeyColourPick, 1, wxEXPAND|wxALL, 5);
panelSizer->Add(fifthRow, 0, wxEXPAND);

wxBoxSizer *sixthRow = new wxBoxSizer(wxHORIZONTAL);
wxStaticText *drawstopColText = new wxStaticText (
Expand Down
101 changes: 100 additions & 1 deletion src/GOODFFrame.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,106 @@ GOODFFrame::GOODFFrame(const wxString& title) : wxFrame(NULL, wxID_ANY, title) {
m_organPanel = new OrganPanel(m_organ, m_Splitter);

leftSplitPanel->SetMinSize(leftSplitPanel->GetSizer()->GetMinSize());
m_organPanel->SetMinSize(m_organPanel->GetSizer()->GetMinSize());

wxSize largestMinSize = m_organPanel->GetSizer()->GetMinSize();
if (largestMinSize.GetWidth() < m_enclosurePanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_enclosurePanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_tremulantPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_tremulantPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_windchestPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_windchestPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_switchPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_switchPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_rankPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_rankPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_stopPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_stopPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_manualPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_manualPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_couplerPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_couplerPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_divisionalPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_divisionalPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_divCplrPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_divCplrPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_generalPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_generalPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_reversiblePistonPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_reversiblePistonPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_panelPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_panelPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_dispMetricsPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_dispMetricsPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_imagePanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_imagePanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_guiButtonPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_guiButtonPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_guiEnclosurePanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_guiEnclosurePanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_guiLabelPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_guiLabelPanel->GetSizer()->GetMinSize().GetWidth());
if (largestMinSize.GetWidth() < m_guiManualPanel->GetSizer()->GetMinSize().GetWidth())
largestMinSize.SetWidth(m_guiManualPanel->GetSizer()->GetMinSize().GetWidth());

if (largestMinSize.GetHeight() < m_enclosurePanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_enclosurePanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_tremulantPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_tremulantPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_windchestPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_windchestPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_switchPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_switchPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_rankPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_rankPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_stopPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_stopPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_manualPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_manualPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_couplerPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_couplerPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_divisionalPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_divisionalPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_divCplrPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_divCplrPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_generalPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_generalPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_reversiblePistonPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_reversiblePistonPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_panelPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_panelPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_dispMetricsPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_dispMetricsPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_imagePanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_imagePanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_guiButtonPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_guiButtonPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_guiEnclosurePanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_guiEnclosurePanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_guiLabelPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_guiLabelPanel->GetSizer()->GetMinSize().GetHeight());
if (largestMinSize.GetHeight() < m_guiManualPanel->GetSizer()->GetMinSize().GetHeight())
largestMinSize.SetHeight(m_guiManualPanel->GetSizer()->GetMinSize().GetHeight());

m_organPanel->SetMinSize(largestMinSize);
m_enclosurePanel->SetMinSize(largestMinSize);
m_tremulantPanel->SetMinSize(largestMinSize);
m_windchestPanel->SetMinSize(largestMinSize);
m_switchPanel->SetMinSize(largestMinSize);
m_rankPanel->SetMinSize(largestMinSize);
m_stopPanel->SetMinSize(largestMinSize);
m_manualPanel->SetMinSize(largestMinSize);
m_couplerPanel->SetMinSize(largestMinSize);
m_divisionalPanel->SetMinSize(largestMinSize);
m_divCplrPanel->SetMinSize(largestMinSize);
m_generalPanel->SetMinSize(largestMinSize);
m_reversiblePistonPanel->SetMinSize(largestMinSize);
m_panelPanel->SetMinSize(largestMinSize);
m_dispMetricsPanel->SetMinSize(largestMinSize);
m_imagePanel->SetMinSize(largestMinSize);
m_guiButtonPanel->SetMinSize(largestMinSize);
m_guiEnclosurePanel->SetMinSize(largestMinSize);
m_guiLabelPanel->SetMinSize(largestMinSize);
m_guiManualPanel->SetMinSize(largestMinSize);

m_Splitter->SplitVertically(leftSplitPanel, m_organPanel);

Expand Down

0 comments on commit fb79300

Please sign in to comment.