mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Remove some incorrect and ignored sizer flags

Browse source
This commit is contained in:
Thomas Goyne 2015-07-28 17:05:50 -07:00
parent d5dde6cff2
commit 9ae508730d
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/dialog_style_editor.cpp
View file

@ -145,7 +145,7 @@ DialogStyleEditor::DialogStyleEditor(wxWindow *parent, AssStyle *style, agi::Con
SetIcon(GETICON(style_toolbutton_16)); SetIcon(GETICON(style_toolbutton_16));
auto add_with_label = [&](wxSizer *sizer, wxString const& label, wxWindow *ctrl) { auto add_with_label = [&](wxSizer *sizer, wxString const& label, wxWindow *ctrl) {
sizer->Add(new wxStaticText(this, -1, label), wxSizerFlags().Center().Right().Border(wxLEFT | wxRIGHT)); sizer->Add(new wxStaticText(this, -1, label), wxSizerFlags().Center().Border(wxLEFT | wxRIGHT));
sizer->Add(ctrl, wxSizerFlags(1).Left().Expand()); sizer->Add(ctrl, wxSizerFlags(1).Left().Expand());
}; };
@ -318,8 +318,8 @@ DialogStyleEditor::DialogStyleEditor(wxWindow *parent, AssStyle *style, agi::Con
wxSizer *MiscBoxBottom = new wxBoxSizer(wxHORIZONTAL); wxSizer *MiscBoxBottom = new wxBoxSizer(wxHORIZONTAL);
add_with_label(MiscBoxBottom, _("Encoding:"), Encoding); add_with_label(MiscBoxBottom, _("Encoding:"), Encoding);
MiscBox->Add(MiscBoxTop, wxSizerFlags().Expand().Center()); MiscBox->Add(MiscBoxTop, wxSizerFlags().Expand());
MiscBox->Add(MiscBoxBottom, wxSizerFlags().Expand().Center().Border(wxTOP)); MiscBox->Add(MiscBoxBottom, wxSizerFlags().Expand().Border(wxTOP));
// Preview // Preview
auto previewButton = new ColourButton(this, wxSize(45, 16), false, OPT_GET("Colour/Style Editor/Background/Preview")->GetColor()); auto previewButton = new ColourButton(this, wxSize(45, 16), false, OPT_GET("Colour/Style Editor/Background/Preview")->GetColor());
@ -361,7 +361,7 @@ DialogStyleEditor::DialogStyleEditor(wxWindow *parent, AssStyle *style, agi::Con
// General Layout // General Layout
wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL); wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL);
MainSizer->Add(ControlSizer, 1, wxALL | wxALIGN_CENTER | wxEXPAND, 5); MainSizer->Add(ControlSizer, 1, wxALL | wxEXPAND, 5);
MainSizer->Add(ButtonSizer, 0, wxBOTTOM | wxEXPAND, 5); MainSizer->Add(ButtonSizer, 0, wxBOTTOM | wxEXPAND, 5);
SetSizerAndFit(MainSizer); SetSizerAndFit(MainSizer);

2
src/dialog_style_manager.cpp
View file

@ -275,7 +275,7 @@ DialogStyleManager::DialogStyleManager(agi::Context *context)
CatalogList = new wxComboBox(this,-1, "", wxDefaultPosition, wxSize(-1,-1), 0, nullptr, wxCB_READONLY); CatalogList = new wxComboBox(this,-1, "", wxDefaultPosition, wxSize(-1,-1), 0, nullptr, wxCB_READONLY);
wxButton *CatalogNew = new wxButton(this, -1, _("New")); wxButton *CatalogNew = new wxButton(this, -1, _("New"));
CatalogDelete = new wxButton(this, -1, _("Delete")); CatalogDelete = new wxButton(this, -1, _("Delete"));
CatalogBox->Add(CatalogList,1,wxEXPAND | wxRIGHT | wxALIGN_RIGHT,5); CatalogBox->Add(CatalogList,1,wxEXPAND | wxRIGHT,5);
CatalogBox->Add(CatalogNew,0,wxRIGHT,5); CatalogBox->Add(CatalogNew,0,wxRIGHT,5);
CatalogBox->Add(CatalogDelete,0,0,0); CatalogBox->Add(CatalogDelete,0,0,0);

6
src/preferences.cpp
View file

@ -599,9 +599,9 @@ Interface_Hotkeys::Interface_Hotkeys(wxTreebook *book, Preferences *parent)
wxSizer *buttons = new wxBoxSizer(wxHORIZONTAL); wxSizer *buttons = new wxBoxSizer(wxHORIZONTAL);
buttons->Add(quick_search, wxSizerFlags().Border()); buttons->Add(quick_search, wxSizerFlags().Border());
buttons->AddStretchSpacer(1); buttons->AddStretchSpacer(1);
buttons->Add(new_button, wxSizerFlags().Border().Right()); buttons->Add(new_button, wxSizerFlags().Border());
buttons->Add(edit_button, wxSizerFlags().Border().Right()); buttons->Add(edit_button, wxSizerFlags().Border());
buttons->Add(delete_button, wxSizerFlags().Border().Right()); buttons->Add(delete_button, wxSizerFlags().Border());
sizer->Add(buttons, wxSizerFlags().Expand()); sizer->Add(buttons, wxSizerFlags().Expand());
sizer->Add(dvc, wxSizerFlags(1).Expand().Border(wxLEFT | wxRIGHT)); sizer->Add(dvc, wxSizerFlags(1).Expand().Border(wxLEFT | wxRIGHT));