diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-29 09:21:41 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-29 09:21:41 +0100 |
| commit | f9559270853e272027f95ba3c067943f839d0f37 (patch) | |
| tree | 9a9bb5239ecb67986c42db1a2a9e21f10d519e11 /src | |
| parent | 549708aa2b871f09594fe917f5c72907eb2bdedc (diff) | |
Layout tweaks.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/film_editor.cc | 18 | ||||
| -rw-r--r-- | src/wx/wx_util.h | 5 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index ca638d8ae..17db76ef6 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -275,25 +275,19 @@ FilmEditor::make_content_panel () _content->InsertColumn (0, wxT("")); _content->SetColumnWidth (0, 512); -#ifdef DCPOMATIC_OSX - int const pad = 2; -#else - int const pad = 0; -#endif - wxBoxSizer* b = new wxBoxSizer (wxVERTICAL); _content_add_file = new wxButton (_content_panel, wxID_ANY, _("Add file(s)...")); - b->Add (_content_add_file, 1, wxEXPAND | wxALL, pad); + b->Add (_content_add_file, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _content_add_folder = new wxButton (_content_panel, wxID_ANY, _("Add folder...")); - b->Add (_content_add_folder, 1, wxEXPAND | wxALL, pad); + b->Add (_content_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove")); - b->Add (_content_remove, 1, wxEXPAND | wxALL, pad); + b->Add (_content_remove, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _content_earlier = new wxButton (_content_panel, wxID_ANY, _("Up")); - b->Add (_content_earlier, 1, wxEXPAND | wxALL, pad); + b->Add (_content_earlier, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _content_later = new wxButton (_content_panel, wxID_ANY, _("Down")); - b->Add (_content_later, 1, wxEXPAND | wxALL, pad); + b->Add (_content_later, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); _content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline...")); - b->Add (_content_timeline, 1, wxEXPAND | wxALL, pad); + b->Add (_content_timeline, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP); s->Add (b, 0, wxALL, 4); diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h index 77ecd9db9..56ed500f6 100644 --- a/src/wx/wx_util.h +++ b/src/wx/wx_util.h @@ -37,8 +37,13 @@ class wxGridBagSizer; #define DCPOMATIC_SIZER_Y_GAP 8 #define DCPOMATIC_SIZER_GAP 8 #define DCPOMATIC_DIALOG_BORDER 12 + /** Spacing to use between buttons in a vertical line */ +#ifdef DCPOMATIC_OSX #define DCPOMATIC_BUTTON_STACK_GAP 2 +#else +#define DCPOMATIC_BUTTON_STACK_GAP 0 +#endif /** @file src/wx/wx_util.h * @brief Some utility functions and classes. |