From a43920089d9e1cae2048c2ce275275c9536ba3a7 Mon Sep 17 00:00:00 2001
From: Brendan Hagan <bhaganksu@gmail.com>
Date: Tue, 12 Jul 2022 00:17:56 -0400
Subject: [PATCH] feat: more slice window alignment options

---
 data/en.mse-locale/locale       |   5 ++-
 resource/shape_align_both.png   | Bin 0 -> 16233 bytes
 resource/shape_align_center.png | Bin 0 -> 384 bytes
 resource/shape_align_middle.png | Bin 0 -> 414 bytes
 resource/win32_res.rc           |   4 ++
 src/gui/image_slice_window.cpp  |  66 ++++++++++++++++++++++++--------
 src/gui/image_slice_window.hpp  |   4 +-
 src/util/window_id.hpp          |   4 +-
 8 files changed, 65 insertions(+), 18 deletions(-)
 create mode 100644 resource/shape_align_both.png
 create mode 100644 resource/shape_align_center.png
 create mode 100644 resource/shape_align_middle.png

diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale
index dae38dc1..66a4a552 100644
--- a/data/en.mse-locale/locale
+++ b/data/en.mse-locale/locale
@@ -540,7 +540,10 @@ label:
 	selection top:			&Top
 	selection width:		&Width
 	selection height:		&Height
-	selection center:       Recenter
+	selection center:				Center
+	selection center vertically:	Center Vertically
+	selection center horizontally:	Center Horizontally
+	selection center both:			Center Both
 	#zoom:				Zoom
 	fix aspect ratio:		Fix aspect ratio (width/height)
 	zoom amount:			Zoom
diff --git a/resource/shape_align_both.png b/resource/shape_align_both.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe874086e22268c6937b434682da0aa170e3a069
GIT binary patch
literal 16233
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
YT9uDF)|;=qiUDg^ub02Sa{G&a0ja9J4gdfE

literal 0
HcmV?d00001

diff --git a/resource/shape_align_center.png b/resource/shape_align_center.png
new file mode 100644
index 0000000000000000000000000000000000000000..efe9a98e5fa3c6ad11072c7d5383c10d7e4bd988
GIT binary patch
literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz5=lfsR5;7E
zlQB-iKoCX0lZXN#7f^BoZov(F2yVbR()a+Jfr4XD(}G0d4$%-{&&>Z6yAF1om>|ST
ztKHFR-u%C_TS&rR#$xWUuInG^#ZbZh<7OKK0Sbr!oPg)`=K8c40#>`ki?apTCliRg
zlEUj-Ocaa&0ziHzlBp`G6i@TVfL<<@Bqx|guvvfy(7bc&my!0N1m(V4lyq=bRi(Le
zNvR9#hi1|)cfp-7Ct3?wOSDE<M|2*zyS*w#7B0_EvZCyJ05D&|O)w|iiKmy3{dYhK
z48S8NTLQQd=0XJFAp|)EP`PR-R|~iiT~^{QkOFs}{;K!;+<YGN>z&|1=(k-c%ksD`
e{M&ClW_$rjx>)p&(flj`0000<MNUMnLSTX|tDpe@

literal 0
HcmV?d00001

diff --git a/resource/shape_align_middle.png b/resource/shape_align_middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..d350dd88fb2095291b2ba40ddab8ebc970ef9715
GIT binary patch
literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzFiAu~R5;6}
zlQBv|K@>&L4`Lx!Vx>#S23&w$uyhfU-d$K`9~Nd8w!zv$M9@Z1$jp29TFj3j_=8Fw
z3{%YI%$@t@b+*~1_I?xG+&ypHkT%yBC*7X`0H;U$*kGH-*D~zj_WsiblwiPy%d>+H
zKsFLsCaZ=4DL6hHA;5x{_a@9VN{~#-l-L5WA>DQvR=Nn0X;LB+>N1A`ku;k<AbVX+
zH;7E;PX{A_>2zxK4npfSnM_=ZsUd2J2vMpSkH_8s%x1H0<)AI26!ZDKD<z2(Sw#&~
zi&!icKie2;LCS6!^iL=uqWb#@bz6v;BGs)k=uOsTvoAGGE#4BM;pr{Oz9Xw2UP43~
z%dM5(0=POq?1p|}tx1NFR}lSg79z~U;|H<^&%0fxam0@G1xTI~54^7K;s5{u07*qo
IM6N<$f&|*C;{X5v

literal 0
HcmV?d00001

diff --git a/resource/win32_res.rc b/resource/win32_res.rc
index ba78d16c..6b5d2d66 100644
--- a/resource/win32_res.rc
+++ b/resource/win32_res.rc
@@ -187,6 +187,10 @@ message_information IMAGE "message_information.png"
 message_warning IMAGE "message_warning.png"
 message_error IMAGE "message_error.png"
 
+shape_align_middle IMAGE "shape_align_middle.png"
+shape_align_center IMAGE "shape_align_center.png"
+shape_align_both IMAGE "shape_align_both.png"
+
 // -------------------------------------------------------- : WX
 
 //wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp"
diff --git a/src/gui/image_slice_window.cpp b/src/gui/image_slice_window.cpp
index ad0df406..1d4e4353 100644
--- a/src/gui/image_slice_window.cpp
+++ b/src/gui/image_slice_window.cpp
@@ -51,14 +51,21 @@ void ImageSlice::constrain(PreferedProperty prefer) {
   }
 }
 
-void ImageSlice::centerSelection() {
-    if (selection.GetWidth() < source.GetWidth()) {
-        selection.x = ((source.GetWidth() - selection.GetWidth()) / 2);
-    }
-
-    if (selection.GetHeight() < source.GetHeight()) {
-        selection.y = ((source.GetHeight() - selection.GetHeight()) / 2);
-    }
+void ImageSlice::centerSelection() {
+  centerSelectionHorizontally();
+  centerSelectionVertically();
+}
+
+void ImageSlice::centerSelectionHorizontally() {
+  if (selection.GetWidth() < source.GetWidth()) {
+    selection.x = ((source.GetWidth() - selection.GetWidth()) / 2);
+  }
+}
+
+void ImageSlice::centerSelectionVertically() {
+  if (selection.GetHeight() < source.GetHeight()) {
+    selection.y = ((source.GetHeight() - selection.GetHeight()) / 2);
+  }
 }
 
 Image ImageSlice::getSlice(double scale) const {
@@ -157,7 +164,23 @@ ImageSliceWindow::ImageSliceWindow(Window* parent, const Image& source, const wx
           s7->Add(width,  0, wxEXPAND);
           s7->Add(new wxStaticText(this, wxID_ANY, _LABEL_("selection height")), 0, wxALIGN_CENTER_VERTICAL);
           s7->Add(height, 0, wxEXPAND);
-          s7->Add(new wxButton(this, ID_SELECTION_CENTER, _LABEL_("selection center")), 0, wxALIGN_CENTER, 2);
+
+          s7->Add(new wxStaticText(this, wxID_ANY, _LABEL_("selection center")), 0, wxALIGN_CENTER_VERTICAL);
+          wxBoxSizer* s7A = new wxBoxSizer(wxHORIZONTAL);
+            wxBitmapButton* center_vertically_button = new wxBitmapButton(this, ID_SELECTION_CENTER_VERTICALLY, wxBitmap(load_resource_image(_("shape_align_middle"))));
+            center_vertically_button->SetToolTip(_LABEL_("selection center vertically"));
+            s7A->Add(center_vertically_button);
+            s7A->AddStretchSpacer();
+
+            wxBitmapButton* center_horizontally_button = new wxBitmapButton(this, ID_SELECTION_CENTER_HORIZONTALLY, wxBitmap(load_resource_image(_("shape_align_center"))));
+            center_horizontally_button->SetToolTip(_LABEL_("selection center horizontally"));
+            s7A->Add(center_horizontally_button);
+            s7A->AddStretchSpacer();
+
+            wxBitmapButton* center_button = new wxBitmapButton(this, ID_SELECTION_CENTER, wxBitmap(load_resource_image(_("shape_align_both"))));
+            center_button->SetToolTip(_LABEL_("selection center both"));
+            s7A->Add(center_button);
+          s7->Add(s7A, 1, wxEXPAND, 0);
         s6->Add(s7, 1, wxEXPAND | wxALL, 4);
       s5->Add(s6, 0, wxEXPAND | wxALL, 4);
       s5->AddStretchSpacer(1);
@@ -299,11 +322,22 @@ void ImageSliceWindow::onUpdateFromControl(PreferedProperty prefer) {
   updateControls();
 }
 
-void ImageSliceWindow::onSelectionCenter(wxCommandEvent&) {
-    slice.centerSelection();
-    preview->update();
-    selector->update();
-    updateControls();
+void ImageSliceWindow::onSelectionCenter(wxCommandEvent& ev) {
+  switch (ev.GetId()) {
+    case ID_SELECTION_CENTER:
+      slice.centerSelection();
+      break;
+    case ID_SELECTION_CENTER_HORIZONTALLY:
+      slice.centerSelectionHorizontally();
+      break;
+    case ID_SELECTION_CENTER_VERTICALLY:
+      slice.centerSelectionVertically();
+      break;
+  }
+    
+  preview->update();
+  selector->update();
+  updateControls();
 }
 
 void ImageSliceWindow::updateControls() {
@@ -356,7 +390,9 @@ BEGIN_EVENT_TABLE(ImageSliceWindow, wxDialog)
   EVT_TEXT      (ID_TOP,      ImageSliceWindow::onChangeTop)
   EVT_TEXT      (ID_WIDTH,      ImageSliceWindow::onChangeWidth)
   EVT_TEXT      (ID_HEIGHT,      ImageSliceWindow::onChangeHeight)
-  EVT_BUTTON (ID_SELECTION_CENTER, ImageSliceWindow::onSelectionCenter)
+  EVT_BUTTON (ID_SELECTION_CENTER, ImageSliceWindow::onSelectionCenter)
+  EVT_BUTTON(ID_SELECTION_CENTER_HORIZONTALLY, ImageSliceWindow::onSelectionCenter)
+  EVT_BUTTON(ID_SELECTION_CENTER_VERTICALLY, ImageSliceWindow::onSelectionCenter)
   EVT_CHECKBOX    (ID_FIX_ASPECT,    ImageSliceWindow::onChangeFixAspect)
   EVT_SPINCTRL    (ID_ZOOM,      ImageSliceWindow::onChangeZoom)
   EVT_SPINCTRL    (ID_ZOOM_X,      ImageSliceWindow::onChangeZoomX)
diff --git a/src/gui/image_slice_window.hpp b/src/gui/image_slice_window.hpp
index de86e16d..2a8dcf1b 100644
--- a/src/gui/image_slice_window.hpp
+++ b/src/gui/image_slice_window.hpp
@@ -43,7 +43,9 @@ public:
   /// Enforce relations between values
   void constrain(PreferedProperty prefer = PREFER_NONE);
   /// Attempt to center the current constraints
-  void centerSelection();
+  void centerSelection();
+  void centerSelectionHorizontally();
+  void centerSelectionVertically();
   /// Get the sliced image
   Image getSlice(double scale = 1.0) const;
   
diff --git a/src/util/window_id.hpp b/src/util/window_id.hpp
index 568046be..2506828b 100644
--- a/src/util/window_id.hpp
+++ b/src/util/window_id.hpp
@@ -272,7 +272,9 @@ enum ControlID {
   ID_TOP,
   ID_WIDTH,
   ID_HEIGHT,
-  ID_SELECTION_CENTER,
+  ID_SELECTION_CENTER,
+  ID_SELECTION_CENTER_HORIZONTALLY,
+  ID_SELECTION_CENTER_VERTICALLY,
   ID_FIX_ASPECT,
   ID_ZOOM,
   ID_ZOOM_X,