From 8b4027d75d6a812e5b301f73eabb3668d706ffb4 Mon Sep 17 00:00:00 2001
From: Morgan Hardwood <bugs@londonlight.org>
Date: Wed, 21 Nov 2018 01:50:44 +0100
Subject: [PATCH] Crop Editing layout fixed

Preferences > Image Processing > Crop Edit was vertically centered with
large empty gaps above and below the frame. Now it starts as soon as the
frame above ends.
---
 rtgui/preferences.cc | 44 +++++++++++++++++++++-----------------------
 rtgui/preferences.h  |  4 ++--
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index b287c6f7b..bdec7ea68 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -599,27 +599,25 @@ Gtk::Widget* Preferences::getImageProcessingPanel ()
     vbImageProcessing->pack_start (*cdf, Gtk::PACK_SHRINK, 4 );
 
     // Crop
-    Gtk::Frame *cropframe = Gtk::manage(new Gtk::Frame(M("PREFERENCES_CROP")));
-    Gtk::VBox *cropvb = Gtk::manage(new Gtk::VBox());
-    Gtk::HBox *crophb = Gtk::manage(new Gtk::HBox());
-    cropGuides = Gtk::manage(new Gtk::ComboBoxText());
-    cropGuides->append(M("PREFERENCES_CROP_GUIDES_NONE"));
-    cropGuides->append(M("PREFERENCES_CROP_GUIDES_FRAME"));
-    cropGuides->append(M("PREFERENCES_CROP_GUIDES_FULL"));
-    crophb->pack_start(*Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_GUIDES") + ": ")), Gtk::PACK_SHRINK, 4);
-    crophb->pack_start(*cropGuides);
-    cropvb->pack_start(*crophb);
-    Gtk::Label *cropAutoFitLabel = Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_AUTO_FIT")));
-    cropAutoFitLabel->set_line_wrap(true);
-    setExpandAlignProperties(cropAutoFitLabel, false, false, Gtk::ALIGN_START, Gtk::ALIGN_START);
-    cropAutoFit = Gtk::manage(new Gtk::CheckButton());
-    setExpandAlignProperties(cropAutoFit, false, true, Gtk::ALIGN_START, Gtk::ALIGN_START);
-    cropAutoFit->add(*cropAutoFitLabel);
-    cropvb->pack_start(*cropAutoFit);
-    cropframe->add(*cropvb);
-    vbImageProcessing->pack_start(*cropframe, Gtk::PACK_SHRINK, 4);
+    Gtk::Frame *cropFrame = Gtk::manage(new Gtk::Frame(M("PREFERENCES_CROP")));
+    Gtk::Grid *cropGrid = Gtk::manage(new Gtk::Grid());
+    Gtk::Label *cropGuidesLbl = Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_GUIDES") + ": "));
+    cropGuidesCombo = Gtk::manage(new Gtk::ComboBoxText());
+    cropGuidesCombo->append(M("PREFERENCES_CROP_GUIDES_NONE"));
+    cropGuidesCombo->append(M("PREFERENCES_CROP_GUIDES_FRAME"));
+    cropGuidesCombo->append(M("PREFERENCES_CROP_GUIDES_FULL"));
+    cropAutoFitCB = Gtk::manage(new Gtk::CheckButton());
+    Gtk::Label *cropAutoFitLbl = Gtk::manage(new Gtk::Label(M("PREFERENCES_CROP_AUTO_FIT")));
+    cropAutoFitLbl->set_line_wrap(true);
+    cropAutoFitCB->add(*cropAutoFitLbl);
+    cropGrid->attach(*cropGuidesLbl, 0, 0, 1, 1);
+    cropGrid->attach(*cropGuidesCombo, 1, 0, 1, 1);
+    cropGrid->attach(*cropAutoFitCB, 0, 1, 2, 1);
+    cropFrame->add(*cropGrid);
+    vbImageProcessing->pack_start(*cropFrame, Gtk::PACK_SHRINK, 4);
 
     swImageProcessing->add(*vbImageProcessing);
+
     return swImageProcessing;
 }
 
@@ -1798,8 +1796,8 @@ void Preferences::storePreferences ()
     moptions.sndLngEditProcDoneSecs = spbSndLngEditProcDoneSecs->get_value ();
 #endif
 
-    moptions.cropGuides = Options::CropGuidesMode(cropGuides->get_active_row_number());
-    moptions.cropAutoFit = cropAutoFit->get_active();
+    moptions.cropGuides = Options::CropGuidesMode(cropGuidesCombo->get_active_row_number());
+    moptions.cropAutoFit = cropAutoFitCB->get_active();
 }
 
 void Preferences::fillPreferences ()
@@ -2015,8 +2013,8 @@ void Preferences::fillPreferences ()
         }
     }
 
-    cropGuides->set_active(moptions.cropGuides);
-    cropAutoFit->set_active(moptions.cropAutoFit);
+    cropGuidesCombo->set_active(moptions.cropGuides);
+    cropAutoFitCB->set_active(moptions.cropAutoFit);
 
     addc.block (false);
     setc.block (false);
diff --git a/rtgui/preferences.h b/rtgui/preferences.h
index 6019604e5..0f4291a1c 100644
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -200,8 +200,8 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
 
     DynamicProfilePanel *dynProfilePanel;
 
-    Gtk::ComboBoxText *cropGuides;
-    Gtk::CheckButton *cropAutoFit;
+    Gtk::ComboBoxText *cropGuidesCombo;
+    Gtk::CheckButton *cropAutoFitCB;
 
     Glib::ustring storedValueRaw;
     Glib::ustring storedValueImg;