aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--widgets/shortcut-bar/e-icon-bar.c17
2 files changed, 12 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 8878e4ff9b..af1c0776d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-21 Christopher James Lahey <clahey@helixcode.com>
+
+ * widgets/shortcut-bar/e-icon-bar.c: Updated to fix a few bugs.
+
2000-03-20 Christopher James Lahey <clahey@helixcode.com>
* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added the
diff --git a/widgets/shortcut-bar/e-icon-bar.c b/widgets/shortcut-bar/e-icon-bar.c
index 9a34892218..2d6fd5d18a 100644
--- a/widgets/shortcut-bar/e-icon-bar.c
+++ b/widgets/shortcut-bar/e-icon-bar.c
@@ -94,8 +94,7 @@ static gboolean e_icon_bar_timeout_handler (gpointer data);
static void e_icon_bar_recalc_common_positions (EIconBar *icon_bar);
static gint e_icon_bar_recalc_item_positions (EIconBar *icon_bar);
-static void e_icon_bar_on_text_resized (GnomeCanvasItem *text_item,
- EIconBar *icon_bar);
+static void e_icon_bar_reflow (ECanvas *canvas);
static gint e_icon_bar_find_item (EIconBar *icon_bar,
GnomeCanvasItem *text_item);
static gboolean e_icon_bar_on_item_event (GnomeCanvasItem *item,
@@ -168,9 +167,11 @@ e_icon_bar_class_init (EIconBarClass *class)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
+ ECanvasClass *ecanvas_class;
object_class = (GtkObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
+ ecanvas_class = E_CANVAS_CLASS( class );
e_icon_bar_signals[ITEM_SELECTED] =
gtk_signal_new ("item_selected",
@@ -204,6 +205,8 @@ e_icon_bar_class_init (EIconBarClass *class)
widget_class->drag_motion = e_icon_bar_drag_motion;
widget_class->drag_leave = e_icon_bar_drag_leave;
+ ecanvas_class->reflow = e_icon_bar_reflow;
+
class->selected_item = NULL;
}
@@ -578,9 +581,6 @@ e_icon_bar_add_item (EIconBar *icon_bar,
"text", text,
NULL);
- gtk_signal_connect (GTK_OBJECT (item.text), "resize",
- GTK_SIGNAL_FUNC (e_icon_bar_on_text_resized),
- icon_bar);
gtk_signal_connect (GTK_OBJECT (item.text), "event",
GTK_SIGNAL_FUNC (e_icon_bar_on_item_event),
icon_bar);
@@ -863,13 +863,12 @@ e_icon_bar_set_item_data_full (EIconBar *icon_bar,
static void
-e_icon_bar_on_text_resized (GnomeCanvasItem *text_item,
- EIconBar *icon_bar)
+e_icon_bar_reflow (ECanvas *canvas)
{
#if 0
- g_print ("In e_icon_bar_on_text_resized\n");
+ g_print ("In e_icon_bar_on_canvas_reflow\n");
+ gtk_widget_queue_resize (GTK_WIDGET (canvas));
#endif
- gtk_widget_queue_resize (GTK_WIDGET (icon_bar));
}