From 8b888f8d5adca6b9c4998e6b2a138e45f9befb6b Mon Sep 17 00:00:00 2001
From: Brendan Hagan <bhaganksu@gmail.com>
Date: Tue, 14 Jun 2022 00:29:06 -0400
Subject: [PATCH] ui: add button for slice selection centering

---
 CMakeLists.txt                 |  2 +-
 data/en.mse-locale/locale      |  1 +
 src/gui/image_slice_window.cpp | 11 ++++++++++-
 src/gui/image_slice_window.hpp |  1 +
 src/util/window_id.hpp         |  1 +
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28b8d8db..54e46995 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.13)
 
-project(magicseteditor VERSION 2.1.2)
+project(magicseteditor VERSION 2.1.3)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale
index aa2893d7..046fafa2 100644
--- a/data/en.mse-locale/locale
+++ b/data/en.mse-locale/locale
@@ -517,6 +517,7 @@ label:
 	selection top:			&Top
 	selection width:		&Width
 	selection height:		&Height
+	selection center:       Recenter
 	#zoom:				Zoom
 	fix aspect ratio:		Fix aspect ratio (width/height)
 	zoom amount:			Zoom
diff --git a/src/gui/image_slice_window.cpp b/src/gui/image_slice_window.cpp
index a3ab465b..9509bf8d 100644
--- a/src/gui/image_slice_window.cpp
+++ b/src/gui/image_slice_window.cpp
@@ -147,7 +147,7 @@ ImageSliceWindow::ImageSliceWindow(Window* parent, const Image& source, const wx
       s5->Add(size, 0, wxEXPAND | wxALL, 4);
       s5->AddStretchSpacer(1);
       wxSizer* s6 = new wxStaticBoxSizer(wxVERTICAL, this, _LABEL_("selection"));
-        wxSizer* s7 = new wxFlexGridSizer(0, 2, 4, 5);
+        wxSizer* s7 = new wxFlexGridSizer(0, 2, 5, 5);
           s7->Add(new wxStaticText(this, wxID_ANY, _LABEL_("selection left")),   0, wxALIGN_CENTER_VERTICAL);
           s7->Add(left,   0, wxEXPAND);
           s7->Add(new wxStaticText(this, wxID_ANY, _LABEL_("selection top")),    0, wxALIGN_CENTER_VERTICAL);
@@ -156,6 +156,7 @@ 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);
         s6->Add(s7, 1, wxEXPAND | wxALL, 4);
       s5->Add(s6, 0, wxEXPAND | wxALL, 4);
       s5->AddStretchSpacer(1);
@@ -297,6 +298,13 @@ void ImageSliceWindow::onUpdateFromControl(PreferedProperty prefer) {
   updateControls();
 }
 
+void ImageSliceWindow::onSelectionCenter(wxCommandEvent&) {
+    slice.centerSelection();
+    preview->update();
+    selector->update();
+    updateControls();
+}
+
 void ImageSliceWindow::updateControls() {
   if (slice.selection.width == slice.target_size.GetWidth() && slice.selection.height == slice.target_size.GetHeight()) {
     size->SetSelection(0); // original size
@@ -347,6 +355,7 @@ 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_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 59af5eda..be505646 100644
--- a/src/gui/image_slice_window.hpp
+++ b/src/gui/image_slice_window.hpp
@@ -93,6 +93,7 @@ private:
   void onChangeTop          (wxCommandEvent&);
   void onChangeWidth        (wxCommandEvent&);
   void onChangeHeight       (wxCommandEvent&);
+  void onSelectionCenter(wxCommandEvent&);
   void onChangeFixAspect    (wxCommandEvent&);
   void onChangeZoom         (wxSpinEvent&);
   void onChangeZoomX        (wxSpinEvent&);
diff --git a/src/util/window_id.hpp b/src/util/window_id.hpp
index b43f8a58..66a3bded 100644
--- a/src/util/window_id.hpp
+++ b/src/util/window_id.hpp
@@ -267,6 +267,7 @@ enum ControlID {
   ID_TOP,
   ID_WIDTH,
   ID_HEIGHT,
+  ID_SELECTION_CENTER,
   ID_FIX_ASPECT,
   ID_ZOOM,
   ID_ZOOM_X,