summaryrefslogtreecommitdiff
path: root/gtk/gtkboxgadgetprivate.h
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2016-04-28 21:55:52 -0400
committerMatthias Clasen <mclasen@redhat.com>2016-04-28 21:59:34 -0400
commit214870891761ce4437821e974c34da99d59eed96 (patch)
treeadcfc01fc3928a60440808e1bd4e23b0c57cb51a /gtk/gtkboxgadgetprivate.h
parent8a308dd072ae07b98b33dd68de43975f884cf1bb (diff)
downloadgtk+-214870891761ce4437821e974c34da99d59eed96.tar.gz
box gadget: Redo expand flag handling
We only keep one align flag per child, so it seems odd to keep separate h/v expand flags. Just keep one expand flag and interpret it according to orientation. Allow setting the expand flag for child widgets too, though, so we can make widget expand without interfering with the recursive widget expand flag. Update all callers. Use the new possibility of expanding child widgets to make the label of check and radio buttons expand. This fixes unexpected behavior of these widgets in RTL in some places. https://bugzilla.gnome.org/show_bug.cgi?id=765742
Diffstat (limited to 'gtk/gtkboxgadgetprivate.h')
-rw-r--r--gtk/gtkboxgadgetprivate.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/gtk/gtkboxgadgetprivate.h b/gtk/gtkboxgadgetprivate.h
index ce1a667a29..046b488290 100644
--- a/gtk/gtkboxgadgetprivate.h
+++ b/gtk/gtkboxgadgetprivate.h
@@ -73,20 +73,17 @@ void gtk_box_gadget_remove_widget (GtkBoxGadget
void gtk_box_gadget_insert_gadget (GtkBoxGadget *gadget,
int pos,
GtkCssGadget *cssgadget,
- gboolean hexpand,
- gboolean vexpand,
+ gboolean expand,
GtkAlign align);
void gtk_box_gadget_insert_gadget_before (GtkBoxGadget *gadget,
GtkCssGadget *sibling,
GtkCssGadget *cssgadget,
- gboolean hexpand,
- gboolean vexpand,
+ gboolean expand,
GtkAlign align);
void gtk_box_gadget_insert_gadget_after (GtkBoxGadget *gadget,
GtkCssGadget *sibling,
GtkCssGadget *cssgadget,
- gboolean hexpand,
- gboolean vexpand,
+ gboolean expand,
GtkAlign align);
void gtk_box_gadget_remove_gadget (GtkBoxGadget *gadget,
@@ -94,11 +91,10 @@ void gtk_box_gadget_remove_gadget (GtkBoxGadget
void gtk_box_gadget_reverse_children (GtkBoxGadget *gadget);
void gtk_box_gadget_set_gadget_expand (GtkBoxGadget *gadget,
- GtkCssGadget *cssgadget,
- gboolean hexpand,
- gboolean vexpand);
+ GObject *object,
+ gboolean expand);
void gtk_box_gadget_set_gadget_align (GtkBoxGadget *gadget,
- GtkCssGadget *cssgadget,
+ GObject *object,
GtkAlign align);
G_END_DECLS