aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-02-18 04:46:02 +0800
committerChristian Persch <chpe@src.gnome.org>2004-02-18 04:46:02 +0800
commitdf8a49847d6089cce269b2f07a157fbc9f2b8197 (patch)
tree4d08049d86085258050ddab09985cf4df68bfdc2
parentc1687084b65bb2e908761e0bfe6af9b7246d6b02 (diff)
downloadgsoc2013-epiphany-df8a49847d6089cce269b2f07a157fbc9f2b8197.tar
gsoc2013-epiphany-df8a49847d6089cce269b2f07a157fbc9f2b8197.tar.gz
gsoc2013-epiphany-df8a49847d6089cce269b2f07a157fbc9f2b8197.tar.bz2
gsoc2013-epiphany-df8a49847d6089cce269b2f07a157fbc9f2b8197.tar.lz
gsoc2013-epiphany-df8a49847d6089cce269b2f07a157fbc9f2b8197.tar.xz
gsoc2013-epiphany-df8a49847d6089cce269b2f07a157fbc9f2b8197.tar.zst
gsoc2013-epiphany-df8a49847d6089cce269b2f07a157fbc9f2b8197.zip
Remove the toolbar height contraint when the first item is added to it.
2004-02-17 Christian Persch <chpe@cvs.gnome.org> * lib/egg/egg-editable-toolbar.c: (item_added_cb), (item_removed_cb), (egg_editable_toolbar_construct): Remove the toolbar height contraint when the first item is added to it. Fixes bug #131181.
-rw-r--r--ChangeLog8
-rwxr-xr-xlib/egg/egg-editable-toolbar.c9
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 119543379..6b8023962 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2004-02-17 Christian Persch <chpe@cvs.gnome.org>
+ * lib/egg/egg-editable-toolbar.c: (item_added_cb),
+ (item_removed_cb), (egg_editable_toolbar_construct):
+
+ Remove the toolbar height contraint when the first item is added
+ to it. Fixes bug #131181.
+
+2004-02-17 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-extension.c: (ephy_extension_get_type),
(ephy_extension_attach_window), (ephy_extension_detach_window):
* src/ephy-extension.h:
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index cc791981b..f1d496336 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -784,16 +784,20 @@ item_added_cb (EggToolbarsModel *model,
int position,
EggEditableToolbar *t)
{
+ GtkWidget *dock;
GtkWidget *toolbar;
GtkWidget *item;
GtkAction *action;
toolbar = get_toolbar_nth (t, toolbar_position);
- gtk_widget_set_size_request (toolbar, -1, -1);
item = create_item (t, model, toolbar_position, position, &action);
gtk_toolbar_insert (GTK_TOOLBAR (toolbar),
GTK_TOOL_ITEM (item), position);
+ dock = get_dock_nth (t, toolbar_position);
+ gtk_widget_set_size_request (dock, -1, -1);
+ gtk_widget_queue_resize_no_redraw (dock);
+
/* FIXME Hack to make tooltip work from gtk */
if (action)
{
@@ -818,7 +822,6 @@ item_removed_cb (EggToolbarsModel *model,
if (egg_toolbars_model_n_items (model, toolbar_position) == 0)
{
- gtk_widget_set_size_request (toolbar, -1, MIN_TOOLBAR_HEIGHT);
egg_toolbars_model_remove_toolbar (model, toolbar_position);
}
}
@@ -897,7 +900,7 @@ egg_editable_toolbar_construct (EggEditableToolbar *t)
if (n_items == 0)
{
- gtk_widget_set_size_request (toolbar, -1, MIN_TOOLBAR_HEIGHT);
+ gtk_widget_set_size_request (dock, -1, MIN_TOOLBAR_HEIGHT);
}
}