aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--widgets/shortcut-bar/e-group-bar.c20
-rw-r--r--widgets/shortcut-bar/e-icon-bar.c3
3 files changed, 19 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 35658b3d17..94b3670995 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-02-07 Damon Chaplin <damon@helixcode.com>
+
+ * widgets/shortcut-bar/e-group-bar.c (e_group_bar_draw): finished.
+
+ * widgets/shortcut-bar/e-icon-bar.c (e_icon_bar_item_released):
+ check that an item was pressed.
+
2000-02-03 bertrand <Bertrand.Guiheneuf@aful.org>
* camel/camel-formatter.c (find_preferred_displayable_body_part_in_multipart_alternative):
@@ -50,6 +57,7 @@
* addressbook/printing/e-contact-print-types.h: Added a type field
for different types of print styles.
+>>>>>>> 1.206
2000-01-28 Christopher James Lahey <clahey@helixcode.com>
* widgets/e-text.c (e_text_command): Handle the grab and ungrab
diff --git a/widgets/shortcut-bar/e-group-bar.c b/widgets/shortcut-bar/e-group-bar.c
index 603aa6f78f..ac3a8d62ab 100644
--- a/widgets/shortcut-bar/e-group-bar.c
+++ b/widgets/shortcut-bar/e-group-bar.c
@@ -582,15 +582,11 @@ e_group_bar_draw (GtkWidget *widget,
EGroupBar *group_bar;
EGroupBarChild *group;
gint group_num;
-#if 0
GdkRectangle child_area;
-#endif
+
g_return_if_fail (widget != NULL);
g_return_if_fail (E_IS_GROUP_BAR (widget));
- g_print ("In e_group_bar_draw %i,%i %ix%i\n", area->x, area->y,
- area->width, area->height);
-
if (GTK_WIDGET_DRAWABLE (widget)) {
group_bar = E_GROUP_BAR (widget);
@@ -599,12 +595,14 @@ e_group_bar_draw (GtkWidget *widget,
group_num++) {
group = &g_array_index (group_bar->children,
EGroupBarChild, group_num);
- /* FIXME */
-#if 0
- if (GTK_WIDGET_DRAWABLE (child->widget) &&
- gtk_widget_intersect (child->widget, area, &child_area))
- gtk_widget_draw (child->widget, &child_area);
-#endif
+
+ if (GTK_WIDGET_DRAWABLE (group->button)
+ && gtk_widget_intersect (group->button, area, &child_area))
+ gtk_widget_draw (group->button, &child_area);
+
+ if (GTK_WIDGET_DRAWABLE (group->child)
+ && gtk_widget_intersect (group->child, area, &child_area))
+ gtk_widget_draw (group->child, &child_area);
}
}
}
diff --git a/widgets/shortcut-bar/e-icon-bar.c b/widgets/shortcut-bar/e-icon-bar.c
index e9643dc451..04c0c83e6f 100644
--- a/widgets/shortcut-bar/e-icon-bar.c
+++ b/widgets/shortcut-bar/e-icon-bar.c
@@ -962,7 +962,8 @@ e_icon_bar_item_released (EIconBar *icon_bar,
button = event->button.button;
if (button == 1) {
- if (icon_bar->pressed_item_num == icon_bar->mouse_over_item_num) {
+ if (icon_bar->pressed_item_num != -1
+ && icon_bar->pressed_item_num == icon_bar->mouse_over_item_num) {
gtk_signal_emit (GTK_OBJECT (icon_bar),
e_icon_bar_signals[ITEM_SELECTED],
event, item_num);