Skip to content

Commit

Permalink
Use wxSizerFlags
Browse files Browse the repository at this point in the history
  • Loading branch information
@Blake-Madden
Blake-Madden committed Oct 27, 2024
1 parent afa849e commit 819e005
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 37 deletions.
10 changes: 5 additions & 5 deletions src/ui/controls/searchpanel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,22 @@ SearchPanel::SearchPanel(wxWindow* parent, wxWindowID id) : wxWindow(parent, id)
wxBoxSizer* mainSizer = new wxBoxSizer(wxHORIZONTAL);

m_search = new wxSearchCtrl(this, ControlIDs::ID_SEARCH_TEXT_ENTRY, wxString{},
wxDefaultPosition, FromDIP(wxSize(200, -1)), 0);
mainSizer->Add(m_search, 0, wxTOP | wxBOTTOM, wxSizerFlags::GetDefaultBorder());
wxDefaultPosition, FromDIP(wxSize{ 200, -1 }), 0);
mainSizer->Add(m_search, wxSizerFlags{}.Border(wxTOP | wxBOTTOM));

wxBitmapButton* nextButton =
new wxBitmapButton(this, ControlIDs::ID_SEARCH_NEXT,
wxArtProvider::GetBitmapBundle(wxART_GO_DOWN, wxART_BUTTON));
nextButton->SetToolTip(_(L"Find the next occurrence"));
mainSizer->Add(nextButton, 0, wxALIGN_CENTER_VERTICAL);
mainSizer->Add(nextButton, wxSizerFlags{}.CentreVertical());

wxBitmapButton* peviousButton =
new wxBitmapButton(this, ControlIDs::ID_SEARCH_PREVIOUS,
wxArtProvider::GetBitmapBundle(wxART_GO_UP, wxART_BUTTON));
peviousButton->SetToolTip(_(L"Find the previous occurrence"));
mainSizer->Add(peviousButton, 0, wxALIGN_CENTER_VERTICAL);
mainSizer->Add(peviousButton, wxSizerFlags{}.CentreVertical());

mainSizer->AddSpacer(3);
mainSizer->AddSpacer(wxSizerFlags::GetDefaultBorder());

SetSizerAndFit(mainSizer);

Expand Down
8 changes: 4 additions & 4 deletions src/ui/dialogs/archivedlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ void ArchiveDlg::CreateControls()

wxBitmapButton* fileBrowseButton = new wxBitmapButton(
this, ID_FILE_BROWSE_BUTTON, wxArtProvider::GetBitmapBundle(wxART_FILE_OPEN, wxART_BUTTON));
fileBrowseBoxSizer->Add(fileBrowseButton, 0, wxALIGN_CENTER_VERTICAL);
fileBrowseBoxSizer->Add(fileBrowseButton, wxSizerFlags{}.CenterVertical());

wxBoxSizer* fileTypeSizer = new wxBoxSizer(wxHORIZONTAL);
mainSizer->Add(fileTypeSizer, wxSizerFlags{}.Expand());
fileTypeSizer->Add(new wxStaticText(this, wxID_STATIC, _(L"File types to include:")), 0,
wxALIGN_CENTER_VERTICAL | wxLEFT, wxSizerFlags::GetDefaultBorder());
fileTypeSizer->Add(new wxStaticText(this, wxID_STATIC, _(L"File types to include:")),
wxSizerFlags{}.CenterVertical().Border(wxLEFT));
wxArrayString choiceStrings;
wxStringTokenizer tkz(m_fullFileFilter, L"|", wxTOKEN_STRTOK);
while (tkz.HasMoreTokens())
Expand All @@ -101,7 +101,7 @@ void ArchiveDlg::CreateControls()
}
m_fileFilterCombo = new wxChoice(this, wxID_ANY, wxDefaultPosition,
// need to hard code size in case file filter is too wide
wxSize(FromDIP(wxSize(150, 150)).GetWidth(), -1),
wxSize(FromDIP(wxSize{ 150, 150 }).GetWidth(), -1),
choiceStrings, 0, wxGenericValidator(&m_selectedFileFilter));
fileTypeSizer->Add(m_fileFilterCombo, wxSizerFlags{ 1 }.Expand().Border());

Expand Down
4 changes: 2 additions & 2 deletions src/ui/dialogs/excelpreviewdlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace Wisteria::UI
0, wxLEFT | wxTOP | wxBOTTOM, wxSizerFlags::GetDefaultBorder());
if (m_wrk->size() > 0)
{
m_grid = new wxGrid(this, wxID_ANY, wxDefaultPosition, FromDIP(wxSize(800, 400)));
m_grid = new wxGrid(this, wxID_ANY, wxDefaultPosition, FromDIP(wxSize{ 800, 400 }));
m_grid->SetTable(new ExcelTable(m_wrk, m_excelFile), true);
m_grid->EnableEditing(false);
m_grid->SetDefaultCellOverflow(false);
Expand All @@ -98,7 +98,7 @@ namespace Wisteria::UI
mainSizer->Add(new wxStaticText(this, wxID_STATIC,
_(L"Note: only text cells are being shown and are "
"truncated here for display purposes.")),
0, wxALL, wxSizerFlags::GetDefaultBorder());
wxSizerFlags{}.Border());
mainSizer->Add(CreateButtonSizer(wxOK | wxHELP), wxSizerFlags{}.Expand().Border());

mainSizer->SetMinSize(GetSize());
Expand Down
7 changes: 3 additions & 4 deletions src/ui/dialogs/filelistdlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace Wisteria::UI

fileListSizer->Add(buttonsSizer);

m_listCtrl = new ListCtrlEx(this, wxID_ANY, wxDefaultPosition, FromDIP(wxSize(600, 400)),
m_listCtrl = new ListCtrlEx(this, wxID_ANY, wxDefaultPosition, FromDIP(wxSize{ 600, 400 }),
wxLC_REPORT | wxLC_VIRTUAL);
m_listCtrl->EnableGridLines();
m_listCtrl->EnableAlternateRowColours(false);
Expand All @@ -73,9 +73,8 @@ namespace Wisteria::UI
wxBoxSizer* fileInfoSizer = new wxBoxSizer(wxVERTICAL);
m_thumbnail = new Wisteria::UI::Thumbnail(
this, wxNullBitmap, Wisteria::ClickMode::FullSizeViewable, false, wxID_ANY,
wxDefaultPosition, FromDIP(wxSize(256, 256)));
fileInfoSizer->Add(m_thumbnail, wxSizerFlags{}.Border(wxDirection::wxALL,
wxSizerFlags::GetDefaultBorder()));
wxDefaultPosition, FromDIP(wxSize{ 256, 256 }));
fileInfoSizer->Add(m_thumbnail, wxSizerFlags{}.Border());

fileInfoSizer->AddStretchSpacer();

Expand Down
8 changes: 4 additions & 4 deletions src/ui/dialogs/getdirdlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,21 @@ void GetDirFilterDialog::CreateControls()

wxTextCtrl* filePathEdit =
new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
wxSize(FromDIP(wxSize(600, 600)).GetWidth(), -1),
wxSize(FromDIP(wxSize{ 600, 600 }).GetWidth(), -1),
wxTE_RICH2 | wxBORDER_THEME, wxGenericValidator(&m_filePath));
filePathEdit->AutoCompleteFileNames();
fileBrowseBoxSizer->Add(filePathEdit, wxSizerFlags{ 1 }.Expand());

wxBitmapButton* fileBrowseButton =
new wxBitmapButton(this, ID_FOLDER_BROWSE_BUTTON,
wxArtProvider::GetBitmapBundle(wxART_FILE_OPEN, wxART_BUTTON));
fileBrowseBoxSizer->Add(fileBrowseButton, 0, wxALIGN_CENTER_VERTICAL);
fileBrowseBoxSizer->Add(fileBrowseButton, wxSizerFlags{}.CenterVertical());

wxBoxSizer* fileTypeSizer = new wxBoxSizer(wxHORIZONTAL);
mainSizer->Add(fileTypeSizer, wxSizerFlags{}.Expand());
fileTypeSizer->Add(new wxStaticText(this, wxID_STATIC, _(L"File types to include:"),
wxDefaultPosition, wxDefaultSize, 0),
0, wxALIGN_CENTER_VERTICAL | wxLEFT, wxSizerFlags::GetDefaultBorder());
wxSizerFlags{}.CenterVertical().Border(wxLEFT));
wxArrayString choiceStrings;
wxStringTokenizer tkz(m_fullFileFilter, L"|", wxTOKEN_STRTOK);
while (tkz.HasMoreTokens())
Expand All @@ -103,7 +103,7 @@ void GetDirFilterDialog::CreateControls()
}
}
m_fileFilterCombo = new wxChoice(this, wxID_ANY, wxDefaultPosition,
wxSize(FromDIP(wxSize(100, 100)).GetWidth(), -1),
wxSize(FromDIP(wxSize{ 100, 100 }).GetWidth(), -1),
choiceStrings, 0, wxGenericValidator(&m_selectedFileFilter));
fileTypeSizer->Add(m_fileFilterCombo, wxSizerFlags{ 1 }.Expand().Border());

Expand Down
8 changes: 4 additions & 4 deletions src/ui/dialogs/graphdlg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ namespace Wisteria::UI
{
SetExtraStyle(GetExtraStyle() | wxWS_EX_BLOCK_EVENTS);
wxDialog::Create(parent, id, caption, pos, size, style);
SetMinSize(FromDIP(wxSize(800, 600)));
SetMinSize(FromDIP(wxSize{ 800, 600 }));

CreateControls();

Expand All @@ -80,15 +80,15 @@ namespace Wisteria::UI
void CreateControls()
{
wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
mainSizer->SetMinSize(FromDIP(wxSize(800, 600)));
mainSizer->SetMinSize(FromDIP(wxSize{ 800, 600 }));

m_canvas = new Wisteria::Canvas(this);
m_canvas->SetFixedObjectsGridSize(1, 1);
mainSizer->Add(m_canvas, wxSizerFlags{ 1 }.Expand().Border());

mainSizer->Add(
new wxStaticLine(this),
wxSizerFlags{}.Expand().Border(wxRIGHT | wxLEFT, wxSizerFlags::GetDefaultBorder()));
wxSizerFlags{}.Expand().Border(wxRIGHT | wxLEFT));
wxBoxSizer* buttonSizer = new wxBoxSizer(wxHORIZONTAL);
{
wxButton* button = new wxButton(this, wxID_PRINT);
Expand All @@ -114,7 +114,7 @@ namespace Wisteria::UI
button->SetDefault();
buttonSizer->Add(button);
}
mainSizer->Add(buttonSizer, 0, wxALIGN_RIGHT | wxALL, wxSizerFlags::GetDefaultBorder());
mainSizer->Add(buttonSizer, wxSizerFlags{}.Border().Right());

SetSizerAndFit(mainSizer);
}
Expand Down
14 changes: 6 additions & 8 deletions src/ui/dialogs/imageexportdlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ void ImageExportDlg::CreateControls(const wxBitmapType bitmapType)
controlsSizer->Add(column1Sizer);
controlsSizer->AddSpacer(wxSizerFlags::GetDefaultBorder());
controlsSizer->Add(column2Sizer);
mainSizer->Add(controlsSizer, wxSizerFlags{}.Expand().Border().Align(wxALIGN_TOP));
mainSizer->Add(controlsSizer, wxSizerFlags{}.Expand().Border().Top());

wxStaticBoxSizer* imageSizeSizer = new wxStaticBoxSizer(wxVERTICAL, this, _(L"Image Size"));
auto imageSizeInfoSizer = new wxGridSizer(
Expand All @@ -96,7 +96,7 @@ void ImageExportDlg::CreateControls(const wxBitmapType bitmapType)

wxStaticText* widthLabel = new wxStaticText(imageSizeSizer->GetStaticBox(), wxID_STATIC,
_(L"Width:"), wxDefaultPosition, wxDefaultSize);
imageSizeInfoSizer->Add(widthLabel, 0, wxALIGN_CENTER_VERTICAL);
imageSizeInfoSizer->Add(widthLabel, wxSizerFlags{}.CenterVertical());
wxSpinCtrl* widthCtrl =
new wxSpinCtrl(imageSizeSizer->GetStaticBox(), ControlIDs::IMAGE_WIDTH_ID,
std::to_wstring(m_options.m_imageSize.GetWidth()), wxDefaultPosition,
Expand All @@ -106,7 +106,7 @@ void ImageExportDlg::CreateControls(const wxBitmapType bitmapType)

wxStaticText* heightLabel = new wxStaticText(imageSizeSizer->GetStaticBox(), wxID_STATIC,
_(L"Height:"), wxDefaultPosition, wxDefaultSize);
imageSizeInfoSizer->Add(heightLabel, 0, wxALIGN_CENTER_VERTICAL);
imageSizeInfoSizer->Add(heightLabel, wxSizerFlags{}.CenterVertical());
wxSpinCtrl* heightCtrl =
new wxSpinCtrl(imageSizeSizer->GetStaticBox(), ControlIDs::IMAGE_HEIGHT_ID,
std::to_wstring(m_options.m_imageSize.GetHeight()), wxDefaultPosition,
Expand Down Expand Up @@ -135,13 +135,11 @@ void ImageExportDlg::CreateControls(const wxBitmapType bitmapType)
column1Sizer->Add(tiffOptionsBoxSizer, wxSizerFlags{}.Expand());

wxBoxSizer* compressionSizer = new wxBoxSizer(wxHORIZONTAL);
tiffOptionsBoxSizer->Add(compressionSizer, 0, wxALIGN_LEFT | wxALL,
wxSizerFlags::GetDefaultBorder());
tiffOptionsBoxSizer->Add(compressionSizer, wxSizerFlags{}.Border());
wxStaticText* compressionLabel =
new wxStaticText(tiffOptionsBoxSizer->GetStaticBox(), wxID_STATIC, _(L"Compression:"),
wxDefaultPosition, wxDefaultSize, 0);
compressionSizer->Add(compressionLabel, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT,
wxSizerFlags::GetDefaultBorder());
compressionSizer->Add(compressionLabel, wxSizerFlags{}.CenterVertical().Border(wxRIGHT));

wxArrayString compressionChoices;
compressionChoices.Add(_(L"None"));
Expand All @@ -165,7 +163,7 @@ void ImageExportDlg::CreateControls(const wxBitmapType bitmapType)
wxStaticBoxSizer* previewSizer = new wxStaticBoxSizer(wxVERTICAL, this, _(L"Preview"));
m_previewThumbnail =
new Thumbnail(previewSizer->GetStaticBox(), m_originalBitmap, ClickMode::DoNothing,
false, wxID_ANY, wxDefaultPosition, FromDIP(wxSize(512, 512)));
false, wxID_ANY, wxDefaultPosition, FromDIP(wxSize{ 512, 512 }));
previewSizer->Add(m_previewThumbnail);
column2Sizer->Add(previewSizer);
}
Expand Down
4 changes: 2 additions & 2 deletions src/ui/dialogs/listctrlitemviewdlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ namespace Wisteria::UI
wxButton* button = new wxButton(this, wxID_COPY);
button->SetBitmap(
wxArtProvider::GetBitmap(wxART_COPY, wxART_BUTTON, FromDIP(wxSize(16, 16))));
buttonSizer->Add(button, 0, wxRIGHT, wxSizerFlags::GetDefaultBorder());
buttonSizer->Add(button, wxSizerFlags{}.Border(wxRIGHT));
}

{
wxButton* button = new wxButton(this, wxID_CLOSE);
button->SetBitmap(
wxArtProvider::GetBitmap(wxART_DELETE, wxART_BUTTON, FromDIP(wxSize(16, 16))));
button->SetDefault();
buttonSizer->Add(button, 0, wxRIGHT, wxSizerFlags::GetDefaultBorder());
buttonSizer->Add(button, wxSizerFlags{}.Border(wxRIGHT));
}

mainSizer->Add(buttonSizer, 0, wxALIGN_RIGHT | wxALL, wxSizerFlags::GetDefaultBorder());
Expand Down
4 changes: 2 additions & 2 deletions src/ui/dialogs/listctrlsortdlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ namespace Wisteria::UI
{
label = new wxStaticText(this, wxID_STATIC, _(L"...then by:"), wxDefaultPosition,
wxDefaultSize, 0);
labelsSizer->Add(label, 0, wxTOP, wxSizerFlags::GetDefaultBorder());
labelsSizer->Add(label, wxSizerFlags{}.Border(wxTOP));
}
optionsSizer->Add(labelsSizer, 0, wxALL, wxSizerFlags::GetDefaultBorder());
optionsSizer->Add(labelsSizer, wxSizerFlags{}.Border());

optionsSizer->Add(m_columnList, wxSizerFlags{ 1 }.Expand());

Expand Down
4 changes: 2 additions & 2 deletions src/ui/dialogs/listdlg.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ namespace Wisteria::UI
void ListDlg::CreateControls()
{
wxBoxSizer* mainSizer = new wxBoxSizer(wxVERTICAL);
mainSizer->SetMinSize(FromDIP(wxSize(800, 600)));
mainSizer->SetMinSize(FromDIP(wxSize{ 800, 600 }));

// the top label
if (m_label.length())
Expand All @@ -218,7 +218,7 @@ namespace Wisteria::UI
labelSizer->Add(new wxStaticText(this, wxID_STATIC, m_label), 0, wxALIGN_CENTER | wxALL,
0);
labelSizer->AddSpacer(wxSizerFlags::GetDefaultBorder());
mainSizer->Add(labelSizer, 0, wxALL, wxSizerFlags::GetDefaultBorder());
mainSizer->Add(labelSizer, wxSizerFlags{}.Border());
}

if ((m_buttonStyle & LD_FIND_BUTTON))
Expand Down

0 comments on commit 819e005

Please sign in to comment.