AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'shortcuts-sizing' into 'master'

Browse Source 
Fix shortcuts window sizing

Closes #11

See merge request GNOME/gtk!885
This commit is contained in:
Matthias Clasen 2019-05-29 21:18:46 +00:00
commit 853e832702
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkshortcutssection.c
View File

@ -70,7 +70,6 @@ struct _GtkShortcutsSection
GList *groups;
gboolean has_filtered_group;
gboolean need_reflow;
};
struct _GtkShortcutsSectionClass
@ -111,7 +110,6 @@ static void gtk_shortcuts_section_add_group (GtkShortcutsSection *self,
static void gtk_shortcuts_section_show_all (GtkShortcutsSection *self);
static void gtk_shortcuts_section_filter_groups (GtkShortcutsSection *self);
static void gtk_shortcuts_section_reflow_groups (GtkShortcutsSection *self);
static void gtk_shortcuts_section_maybe_reflow (GtkShortcutsSection *self);
static gboolean gtk_shortcuts_section_change_current_page (GtkShortcutsSection *self,
gint offset);
@ -180,9 +178,6 @@ gtk_shortcuts_section_map (GtkWidget *widget)
{
GtkShortcutsSection *self = GTK_SHORTCUTS_SECTION (widget);
if (self->need_reflow)
gtk_shortcuts_section_reflow_groups (self);
GTK_WIDGET_CLASS (gtk_shortcuts_section_parent_class)->map (widget);
map_child (GTK_WIDGET (self->stack));
@ -485,7 +480,7 @@ gtk_shortcuts_section_set_max_height (GtkShortcutsSection *self,
self->max_height = max_height;
gtk_shortcuts_section_maybe_reflow (self);
gtk_shortcuts_section_reflow_groups (self);
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MAX_HEIGHT]);
}
@ -520,7 +515,7 @@ gtk_shortcuts_section_add_group (GtkShortcutsSection *self,
gtk_container_add (GTK_CONTAINER (column), GTK_WIDGET (group));
self->groups = g_list_append (self->groups, group);
gtk_shortcuts_section_maybe_reflow (self);
gtk_shortcuts_section_reflow_groups (self);
}
static void
@ -568,15 +563,6 @@ gtk_shortcuts_section_filter_groups (GtkShortcutsSection *self)
gtk_widget_get_visible (GTK_WIDGET (self->switcher)));
}
static void
gtk_shortcuts_section_maybe_reflow (GtkShortcutsSection *self)
{
if (gtk_widget_get_mapped (GTK_WIDGET (self)))
gtk_shortcuts_section_reflow_groups (self);
else
self->need_reflow = TRUE;
}
static void
adjust_page_buttons (GtkWidget *widget,
gpointer data)
@ -761,8 +747,6 @@ gtk_shortcuts_section_reflow_groups (GtkShortcutsSection *self)
/* clean up */
g_list_free (groups);
g_list_free (pages);
self->need_reflow = FALSE;
}
static gboolean