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

Make dropping of expandable items look nicer.

Browse Source 
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.
This commit is contained in:
Soeren Sandmann
2004-09-08 16:40:31 +00:00
committed by Søren Sandmann Pedersen
parent 0b4dd7930e
commit e0b2ead302
5 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
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.
2004-09-07 Matthias Clasen <mclasen@redhat.com> 2004-09-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type

12
ChangeLog.pre-2-10
View File

@ -1,3 +1,15 @@
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.
2004-09-07 Matthias Clasen <mclasen@redhat.com> 2004-09-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type

12
ChangeLog.pre-2-6
View File

@ -1,3 +1,15 @@
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.
2004-09-07 Matthias Clasen <mclasen@redhat.com> 2004-09-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type

12
ChangeLog.pre-2-8
View File

@ -1,3 +1,15 @@
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.
2004-09-07 Matthias Clasen <mclasen@redhat.com> 2004-09-07 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type * gtk/gtkuimanager.c (gtk_ui_manager_add_ui): Use the proper node type

15
gtk/gtktoolbar.c
View File

@ -291,7 +291,8 @@ static gboolean toolbar_content_has_proxy_menu_item (ToolbarContent *co
static gboolean toolbar_content_is_separator (ToolbarContent *content); static gboolean toolbar_content_is_separator (ToolbarContent *content);
static void toolbar_content_show_all (ToolbarContent *content); static void toolbar_content_show_all (ToolbarContent *content);
static void toolbar_content_hide_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) \ #define GTK_TOOLBAR_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_TOOLBAR, GtkToolbarPrivate)) (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), gtk_widget_size_request (GTK_WIDGET (priv->highlight_tool_item),
&requisition); &requisition);
toolbar_content_set_expand (content, gtk_tool_item_get_expand (tool_item));
restart_sliding = FALSE; restart_sliding = FALSE;
toolbar_content_size_request (content, toolbar, &old_requisition); toolbar_content_size_request (content, toolbar, &old_requisition);
@ -4187,7 +4189,8 @@ static gboolean
toolbar_content_get_expand (ToolbarContent *content) toolbar_content_get_expand (ToolbarContent *content)
{ {
if (content->type == TOOL_ITEM && 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; return TRUE;
} }
@ -4494,6 +4497,14 @@ toolbar_content_is_separator (ToolbarContent *content)
return FALSE; 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 static gboolean
ignore_show_and_hide_all (ToolbarContent *content) ignore_show_and_hide_all (ToolbarContent *content)
{ {