diff options
| author | Soeren Sandmann <sandmann@redhat.com> | 2004-09-08 16:40:31 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2004-09-08 16:40:31 +0000 |
| commit | e0b2ead302cfab730f65f6584caf8d2c786250f8 (patch) | |
| tree | 1ad16205fca2200c2b2f4f9c72ac17cf3e7f493c /gtk/gtktoolbar.c | |
| parent | 0b4dd7930eb5c5f65ed06a7bdd2f7c63c6c5c238 (diff) | |
| download | gtk+-e0b2ead302cfab730f65f6584caf8d2c786250f8.tar.gz | |
Make dropping of expandable items look nicer.
Wed Sep 8 18:38:08 2004 Soeren Sandmann <sandmann@redhat.com>
Make dropping of expandable items look nicer.
* gtk/gtktoolbar.c (gtk_toolbar_set_drop_highlight_item): Make
placeholder expand if highlight item is expanding.
* gtk/gtktoolbar.c (toolbar_content_set_expand): New function.
* gtk/gtktoolbar.c (toolbar_content_get_expand): Return TRUE only
if the item is not disappering.
Diffstat (limited to 'gtk/gtktoolbar.c')
| -rw-r--r-- | gtk/gtktoolbar.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 9896604985..a53a24ffb1 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -291,7 +291,8 @@ static gboolean toolbar_content_has_proxy_menu_item (ToolbarContent *co static gboolean toolbar_content_is_separator (ToolbarContent *content); static void toolbar_content_show_all (ToolbarContent *content); static void toolbar_content_hide_all (ToolbarContent *content); - +static void toolbar_content_set_expand (ToolbarContent *content, + gboolean expand); #define GTK_TOOLBAR_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_TOOLBAR, GtkToolbarPrivate)) @@ -2248,6 +2249,7 @@ gtk_toolbar_set_drop_highlight_item (GtkToolbar *toolbar, gtk_widget_size_request (GTK_WIDGET (priv->highlight_tool_item), &requisition); + toolbar_content_set_expand (content, gtk_tool_item_get_expand (tool_item)); restart_sliding = FALSE; toolbar_content_size_request (content, toolbar, &old_requisition); @@ -4187,7 +4189,8 @@ static gboolean toolbar_content_get_expand (ToolbarContent *content) { if (content->type == TOOL_ITEM && - gtk_tool_item_get_expand (content->u.tool_item.item)) + gtk_tool_item_get_expand (content->u.tool_item.item) && + !content->u.tool_item.disappearing) { return TRUE; } @@ -4494,6 +4497,14 @@ toolbar_content_is_separator (ToolbarContent *content) return FALSE; } +static void +toolbar_content_set_expand (ToolbarContent *content, + gboolean expand) +{ + if (content->type == TOOL_ITEM) + gtk_tool_item_set_expand (content->u.tool_item.item, expand); +} + static gboolean ignore_show_and_hide_all (ToolbarContent *content) { |