From: Carl Hetherington <cth@carlh.net>
Date: Fri, 22 Apr 2016 15:17:11 +0000 (+0100)
Subject: Tweak vertical layout in the KDM creator (#833).
X-Git-Tag: v2.7.15~6
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=28af00e58684a880ed188b24a4f5d81d5e77db38

Tweak vertical layout in the KDM creator (#833).
---

diff --git a/ChangeLog b/ChangeLog
index f279abba4..04a7a77d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-04-22  c.hetherington  <cth@carlh.net>
 
+	* Arrange buttons to consume less vertical space in the
+	KDM creator (#833).
+
 	* Select active channels on opening audio analysis (#802).
 
 	* Disallow KDM until times from being before from times (#821).
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index ddb088c2f..4f95ff408 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -51,21 +51,20 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 
 	add_cinemas ();
 
-	wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL);
+	wxGridSizer* target_buttons = new wxGridSizer (2, DCPOMATIC_BUTTON_STACK_GAP * 2, DCPOMATIC_SIZER_Y_GAP);
 
 	_add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema..."));
-	target_buttons->Add (_add_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-	_edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema..."));
-	target_buttons->Add (_edit_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-	_remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema"));
-	target_buttons->Add (_remove_cinema, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-
+	target_buttons->Add (_add_cinema, 1, wxEXPAND);
 	_add_screen = new wxButton (this, wxID_ANY, _("Add Screen..."));
-	target_buttons->Add (_add_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+	target_buttons->Add (_add_screen, 1, wxEXPAND);
+	_edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema..."));
+	target_buttons->Add (_edit_cinema, 1, wxEXPAND);
 	_edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen..."));
-	target_buttons->Add (_edit_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+	target_buttons->Add (_edit_screen, 1, wxEXPAND);
+	_remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema"));
+	target_buttons->Add (_remove_cinema, 1, wxEXPAND);
 	_remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen"));
-	target_buttons->Add (_remove_screen, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+	target_buttons->Add (_remove_screen, 1, wxEXPAND);
 
 	targets->Add (target_buttons, 0, 0);