callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtkpopover: Update the menu's alignment

Browse Source 
... when the popover position changes.
This commit is contained in:
Timm Bäder 2015-03-17 19:34:43 +01:00
parent 36c65c1aca
commit d3a18de97e
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gtk/gtkmenusectionbox.c
View File

@ -277,7 +277,7 @@ gtk_menu_section_box_insert_func (GtkMenuTrackerItem *item,
gchar *name; gchar *name;
widget = g_object_new (GTK_TYPE_MODEL_BUTTON, widget = g_object_new (GTK_TYPE_MODEL_BUTTON,
"menu-name", gtk_menu_tracker_item_get_label (item), "menu-name", gtk_menu_tracker_item_get_label (item),
NULL); NULL);
g_object_bind_property (item, "label", widget, "text", G_BINDING_SYNC_CREATE); g_object_bind_property (item, "label", widget, "text", G_BINDING_SYNC_CREATE);
g_object_bind_property (item, "icon", widget, "icon", G_BINDING_SYNC_CREATE); g_object_bind_property (item, "icon", widget, "icon", G_BINDING_SYNC_CREATE);
@ -369,10 +369,39 @@ gtk_menu_section_box_class_init (GtkMenuSectionBoxClass *class)
G_OBJECT_CLASS (class)->dispose = gtk_menu_section_box_dispose; G_OBJECT_CLASS (class)->dispose = gtk_menu_section_box_dispose;
} }
static void
update_popover_position_cb (GObject *source,
GParamSpec *spec,
gpointer *user_data)
{
GtkPopover *popover = GTK_POPOVER (source);
GtkMenuSectionBox *box = GTK_MENU_SECTION_BOX (user_data);
GtkPositionType new_pos = gtk_popover_get_position (popover);
GList *children = gtk_container_get_children (GTK_CONTAINER (gtk_widget_get_parent (GTK_WIDGET (box))));
GList *l;
for (l = children;
l != NULL;
l = l->next)
{
GtkWidget *w = l->data;
if (new_pos == GTK_POS_BOTTOM)
gtk_widget_set_valign (w, GTK_ALIGN_START);
else if (new_pos == GTK_POS_TOP)
gtk_widget_set_valign (w, GTK_ALIGN_END);
else
gtk_widget_set_valign (w, GTK_ALIGN_CENTER);
}
}
void void
gtk_menu_section_box_new_toplevel (GtkStack *stack, gtk_menu_section_box_new_toplevel (GtkStack *stack,
GMenuModel *model, GMenuModel *model,
const gchar *action_namespace) const gchar *action_namespace,
GtkPopover *popover)
{ {
GtkMenuSectionBox *box; GtkMenuSectionBox *box;
@ -384,6 +413,9 @@ gtk_menu_section_box_new_toplevel (GtkStack *stack,
gtk_menu_section_box_insert_func, gtk_menu_section_box_insert_func,
gtk_menu_section_box_remove_func, box); gtk_menu_section_box_remove_func, box);
g_signal_connect (G_OBJECT (popover), "notify::position", G_CALLBACK (update_popover_position_cb), box);
gtk_widget_show (GTK_WIDGET (box)); gtk_widget_show (GTK_WIDGET (box));
} }

4
gtk/gtkmenusectionbox.h
View File

@ -23,6 +23,7 @@
#include <gtk/gtkmenutrackeritem.h> #include <gtk/gtkmenutrackeritem.h>
#include <gtk/gtkstack.h> #include <gtk/gtkstack.h>
#include <gtk/gtkbox.h> #include <gtk/gtkbox.h>
#include <gtk/gtkpopover.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -43,7 +44,8 @@ typedef struct _GtkMenuSectionBox GtkMenuSectionBox;
GType gtk_menu_section_box_get_type (void) G_GNUC_CONST; GType gtk_menu_section_box_get_type (void) G_GNUC_CONST;
void gtk_menu_section_box_new_toplevel (GtkStack *stack, void gtk_menu_section_box_new_toplevel (GtkStack *stack,
GMenuModel *model, GMenuModel *model,
const gchar *action_namespace); const gchar *action_namespace,
GtkPopover *popover);
G_END_DECLS G_END_DECLS

5
gtk/gtkpopover.c
View File

@ -2330,7 +2330,10 @@ gtk_popover_bind_model (GtkPopover *popover,
gtk_widget_show (stack); gtk_widget_show (stack);
gtk_container_add (GTK_CONTAINER (popover), stack); gtk_container_add (GTK_CONTAINER (popover), stack);
gtk_menu_section_box_new_toplevel (GTK_STACK (stack), model, action_namespace); gtk_menu_section_box_new_toplevel (GTK_STACK (stack),
model,
action_namespace,
popover);
gtk_stack_set_visible_child_name (GTK_STACK (stack), "main"); gtk_stack_set_visible_child_name (GTK_STACK (stack), "main");
g_signal_connect (popover, "unmap", G_CALLBACK (back_to_main), NULL); g_signal_connect (popover, "unmap", G_CALLBACK (back_to_main), NULL);