[gimp] Bug 755005 - Align Tool > Distribute - vertical offset is missing

[Michael Schumacher <schumaml src gnome org>]

commit 6e900c5bbb72f61a7cde39dae5d4a178b8fc7469
Author: Jonathan Tait <jontait2 gmail com>
Date:   Sun May 29 00:39:22 2016 +0200

    Bug 755005 - Align Tool > Distribute - vertical offset is missing

 app/tools/gimpalignoptions.c |   15 ++++++++++++++-
 app/tools/gimpaligntool.c    |    7 +++++--
 2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/app/tools/gimpalignoptions.c b/app/tools/gimpalignoptions.c
index 52353ff..f10de3d 100644
--- a/app/tools/gimpalignoptions.c
+++ b/app/tools/gimpalignoptions.c
@@ -377,7 +377,7 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  label = gtk_label_new (_("Offset:"));
+  label = gtk_label_new (_("Offset X:"));
   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
@@ -386,5 +386,18 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
   gtk_widget_show (spinbutton);
 
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (_("Offset Y:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  spinbutton = gimp_prop_spin_button_new (config, "offset-y",
+                                          1, 20, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
+  gtk_widget_show (spinbutton);
+
   return vbox;
 }
diff --git a/app/tools/gimpaligntool.c b/app/tools/gimpaligntool.c
index aca03c4..83622eb 100644
--- a/app/tools/gimpaligntool.c
+++ b/app/tools/gimpaligntool.c
@@ -727,12 +727,15 @@ gimp_align_tool_align (GimpAlignTool     *align_tool,
     case GIMP_ARRANGE_LEFT:
     case GIMP_ARRANGE_HCENTER:
     case GIMP_ARRANGE_RIGHT:
+    case GIMP_ARRANGE_HFILL:
+      offset = options->offset_x;
+      break;
+
     case GIMP_ARRANGE_TOP:
     case GIMP_ARRANGE_VCENTER:
     case GIMP_ARRANGE_BOTTOM:
-    case GIMP_ARRANGE_HFILL:
     case GIMP_ARRANGE_VFILL:
-      offset = options->offset_x;
+      offset = options->offset_y;
       break;
     }