summaryrefslogtreecommitdiff
path: root/gtk/gtkenums.h
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2013-03-05 15:06:12 +0100
committerAlexander Larsson <alexl@redhat.com>2013-04-23 05:47:31 +0200
commitf15bc7818e0941da80c4ee380a25daf7fcd99d72 (patch)
treeb55f48c415bfc67bf6e3e6821206b661858b6ff7 /gtk/gtkenums.h
parent655c781b6e0c0a6e755ea136e86fd7a3f11767c5 (diff)
downloadgtk+-f15bc7818e0941da80c4ee380a25daf7fcd99d72.tar.gz
Add GTK_ALIGN_BASELINE to GtkAlign
Setting this means baseline aware containers should align the widget according to the baseline. For other containers this behaves like FILL. In order to not suprise old code with a new enum value we always return _FILL for _BASELINE unless you specifically request it via gtk_widget_get_valign_with_baseline().
Diffstat (limited to 'gtk/gtkenums.h')
-rw-r--r--gtk/gtkenums.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index 1789d98c41..9df69a89d5 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -51,6 +51,7 @@ G_BEGIN_DECLS
* or top
* @GTK_ALIGN_CENTER: center natural width of widget inside the
* allocation
+ * @GTK_ALIGN_BASELINE: align the widget according to the baseline. Since 3.10.
*
* Controls how a widget deals with extra space in a single (x or y)
* dimension.
@@ -64,13 +65,18 @@ G_BEGIN_DECLS
*
* Note that in horizontal context @GTK_ALIGN_START and @GTK_ALIGN_END
* are interpreted relative to text direction.
+ *
+ * GTK_ALIGN_BASELINE support for it is optional for containers and widgets, and
+ * it is only supported for vertical alignment. When its not supported by
+ * a child or a container it is treated as @GTK_ALIGN_FILL.
*/
typedef enum
{
GTK_ALIGN_FILL,
GTK_ALIGN_START,
GTK_ALIGN_END,
- GTK_ALIGN_CENTER
+ GTK_ALIGN_CENTER,
+ GTK_ALIGN_BASELINE
} GtkAlign;