[gimp] Fixed that anchor position of text is shifted when text direction is changed.

[Jehan <jehanp src gnome org>]

commit 70945b896008f2cdb2c62de52e17cbad8e894520
Author: ONO Yoshio <ohtsuka yoshio gmail com>
Date:   Tue Jul 31 16:27:33 2018 +0900

    Fixed that anchor position of text is shifted when text direction is changed.
    
    anchor of LTR is top-left corner.
    anchor of TTB-RTL is top-right cornner.
    anchor of TTB-LTR is top-left cornner.

 app/text/gimptextlayer.c | 84 ++++++++++++++++++++++++++++++++++++++----------
 app/text/gimptextlayer.h |  5 ++-
 app/tools/gimptexttool.c |  9 ++++++
 3 files changed, 80 insertions(+), 18 deletions(-)
---
diff --git a/app/text/gimptextlayer.c b/app/text/gimptextlayer.c
index 525afb8dea..13494e83f2 100644
--- a/app/text/gimptextlayer.c
+++ b/app/text/gimptextlayer.c
@@ -66,6 +66,10 @@ enum
   PROP_MODIFIED
 };
 
+struct _GimpTextLayerPrivate
+{
+  GimpTextDirection base_dir;
+};
 
 static void       gimp_text_layer_finalize       (GObject           *object);
 static void       gimp_text_layer_get_property   (GObject           *object,
@@ -180,6 +184,8 @@ gimp_text_layer_class_init (GimpTextLayerClass *klass)
                             NULL, NULL,
                             FALSE,
                             GIMP_PARAM_STATIC_STRINGS);
+
+ g_type_class_add_private (klass, sizeof (GimpTextLayerPrivate));
 }
 
 static void
@@ -187,6 +193,9 @@ gimp_text_layer_init (GimpTextLayer *layer)
 {
   layer->text          = NULL;
   layer->text_parasite = NULL;
+  layer->private       = G_TYPE_INSTANCE_GET_PRIVATE (layer,
+                                                      GIMP_TYPE_TEXT_LAYER,
+                                                      GimpTextLayerPrivate);
 }
 
 static void
@@ -294,6 +303,8 @@ gimp_text_layer_duplicate (GimpItem *item,
       /*  this is just the parasite name, not a pointer to the parasite  */
       if (layer->text_parasite)
         new_layer->text_parasite = layer->text_parasite;
+
+      new_layer->private->base_dir = layer->private->base_dir;
     }
 
   return new_item;
@@ -449,6 +460,8 @@ gimp_text_layer_new (GimpImage *image,
 
   gimp_text_layer_set_text (layer, text);
 
+  layer->private->base_dir = text->base_dir;
+
   if (! gimp_text_layer_render (layer))
     {
       g_object_unref (layer);
@@ -610,7 +623,60 @@ gimp_text_layer_text_changed (GimpTextLayer *layer)
       layer->text_parasite = NULL;
     }
 
-  gimp_text_layer_render (layer);
+  if (layer->text->box_mode == GIMP_TEXT_BOX_DYNAMIC)
+    {
+      gint                old_width;
+      gint                new_width;
+      GimpItem           *item         = GIMP_ITEM (layer);
+      GimpTextDirection   old_base_dir = layer->private->base_dir;
+      GimpTextDirection   new_base_dir = layer->text->base_dir;
+
+      old_width = gimp_item_get_width(item);
+      gimp_text_layer_render (layer);
+      new_width = gimp_item_get_width(item);
+
+      if (old_base_dir != new_base_dir)
+        {
+          switch (old_base_dir)
+            {
+            case GIMP_TEXT_DIRECTION_RTL:
+            case GIMP_TEXT_DIRECTION_LTR:
+            case GIMP_TEXT_DIRECTION_TTB_LTR:
+            case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+              switch (new_base_dir)
+                {
+                case GIMP_TEXT_DIRECTION_TTB_RTL:
+                case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+                  gimp_item_translate (item, -new_width, 0, FALSE);
+                  break;
+                }
+              break;
+
+            case GIMP_TEXT_DIRECTION_TTB_RTL:
+            case GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT:
+              switch (new_base_dir)
+                {
+                case GIMP_TEXT_DIRECTION_RTL:
+                case GIMP_TEXT_DIRECTION_LTR:
+                case GIMP_TEXT_DIRECTION_TTB_LTR:
+                case GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT:
+                  gimp_item_translate (item, old_width, 0, FALSE);
+                  break;
+                }
+              break;
+            }
+        }
+      else if ((new_base_dir == GIMP_TEXT_DIRECTION_TTB_RTL ||
+              new_base_dir == GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT))
+        {
+          if (old_width != new_width)
+            gimp_item_translate (item, old_width - new_width, 0, FALSE);
+        }
+    }
+  else
+    gimp_text_layer_render (layer);
+
+  layer->private->base_dir = layer->text->base_dir;
 }
 
 static gboolean
@@ -663,26 +729,10 @@ gimp_text_layer_render (GimpTextLayer *layer)
        gimp_drawable_get_format (drawable)))
     {
       GeglBuffer *new_buffer;
-      GimpItem   *item;
-      gint        oldwidth;
-      gint        newwidth;
-
-      item = GIMP_ITEM (drawable);
-      oldwidth = gimp_item_get_width (item);
 
       new_buffer = gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
                                     gimp_text_layer_get_format (layer));
       gimp_drawable_set_buffer (drawable, FALSE, NULL, new_buffer);
-
-      newwidth = gimp_item_get_width(item);
-      if (layer->text->box_mode == GIMP_TEXT_BOX_DYNAMIC &&
-          oldwidth != newwidth &&
-          (layer->text->base_dir == GIMP_TEXT_DIRECTION_TTB_RTL ||
-           layer->text->base_dir == GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT))
-        {
-          gimp_item_translate (item, oldwidth - newwidth, 0, FALSE);
-        }
-
       g_object_unref (new_buffer);
 
       if (gimp_layer_get_mask (GIMP_LAYER (layer)))
diff --git a/app/text/gimptextlayer.h b/app/text/gimptextlayer.h
index e78671fd7b..87c61a724d 100644
--- a/app/text/gimptextlayer.h
+++ b/app/text/gimptextlayer.h
@@ -33,7 +33,8 @@
 #define GIMP_TEXT_LAYER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_TEXT_LAYER, 
GimpTextLayerClass))
 
 
-typedef struct _GimpTextLayerClass GimpTextLayerClass;
+typedef struct _GimpTextLayerClass   GimpTextLayerClass;
+typedef struct _GimpTextLayerPrivate GimpTextLayerPrivate;
 
 struct _GimpTextLayer
 {
@@ -48,6 +49,8 @@ struct _GimpTextLayer
   gboolean      modified;
 
   const Babl   *convert_format;
+
+  GimpTextLayerPrivate *private;
 };
 
 struct _GimpTextLayerClass
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index 3e9f2eb24a..f9a7c113b7 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -1609,6 +1609,15 @@ gimp_text_tool_create_layer (GimpTextTool *text_tool,
                 "y2", &y2,
                 NULL);
 
+  if (text_tool->text_box_fixed == FALSE)
+    {
+      if (text_tool->text &&
+          (text_tool->text->base_dir == GIMP_TEXT_DIRECTION_TTB_RTL ||
+           text_tool->text->base_dir == GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT))
+        {
+          x1 -= gimp_item_get_width(GIMP_ITEM (layer));
+        }
+    }
   gimp_item_set_offset (GIMP_ITEM (layer), x1, y1);
 
   gimp_image_add_layer (image, layer,