Imported Upstream version 3.2.0

[glabels] / src / label-object.c

diff --git a/src/label-object.c b/src/label-object.c
index 92a8ec20862771f6fbc530086f0a93c40fecffcb..987f1b549995f1e6b28ce859972c82685ae39b5d 100644 (file)
--- a/src/label-object.c
+++ b/src/label-object.c
@@ -381,8 +381,6 @@ gl_label_object_set_position (glLabelObject *object,
                              gdouble        y,
                               gboolean       checkpoint)
 {
-       gdouble  dx, dy;
-
        gl_debug (DEBUG_LABEL, "START");
 
        g_return_if_fail (object && GL_IS_LABEL_OBJECT (object));
@@ -394,9 +392,6 @@ gl_label_object_set_position (glLabelObject *object,
                         gl_label_checkpoint (object->priv->parent, _("Move"));
                 }
 
-               dx = x - object->priv->x;
-               dy = y - object->priv->y;
-
                object->priv->x = x;
                object->priv->y = y;
 
@@ -782,6 +777,28 @@ gl_label_object_set_text_alignment (glLabelObject     *object,
 }
 
 
+/****************************************************************************/
+/* Set vertical text alignment for all text contained in object.            */
+/****************************************************************************/
+void
+gl_label_object_set_text_valignment (glLabelObject     *object,
+                                    glValignment       text_valignment,
+                                     gboolean           checkpoint)
+{
+       gl_debug (DEBUG_LABEL, "START");
+
+       g_return_if_fail (object && GL_IS_LABEL_OBJECT (object));
+
+       if ( GL_LABEL_OBJECT_GET_CLASS(object)->set_text_valignment != NULL )
+        {
+               /* We have an object specific method, use it */
+               GL_LABEL_OBJECT_GET_CLASS(object)->set_text_valignment (object, text_valignment, checkpoint);
+       }
+
+       gl_debug (DEBUG_LABEL, "END");
+}
+
+
 /****************************************************************************/
 /* Set text line spacing for all text contained in object.                  */
 /****************************************************************************/
@@ -946,6 +963,30 @@ gl_label_object_get_text_alignment (glLabelObject     *object)
 }
 
 
+/****************************************************************************/
+/* Get text alignment for all text contained in object.                     */
+/****************************************************************************/
+glValignment
+gl_label_object_get_text_valignment (glLabelObject     *object)
+{
+       glValignment ret = GL_VALIGN_TOP;
+
+       gl_debug (DEBUG_LABEL, "START");
+
+       g_return_val_if_fail (object && GL_IS_LABEL_OBJECT (object), GL_VALIGN_TOP);
+
+       if ( GL_LABEL_OBJECT_GET_CLASS(object)->get_text_valignment != NULL )
+        {
+               /* We have an object specific method, use it */
+               ret = GL_LABEL_OBJECT_GET_CLASS(object)->get_text_valignment (object);
+       }
+
+       gl_debug (DEBUG_LABEL, "END");
+
+       return ret;
+}
+
+
 /****************************************************************************/
 /* Get text line spacing for all text contained in object.                  */
 /****************************************************************************/