aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/e-day-view.c8
-rw-r--r--calendar/gui/e-week-view.c8
3 files changed, 14 insertions, 10 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index e8782a52b4..f7d47c8ce9 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-13 Chow Loong Jin <hyperair@gmail.com>
+
+ ** Fixes bug #571625
+
+ * calendar/gui/e-day-view.c
+ * calendar/gui/e-week-view.c:
+ Use black/white for foreground instead of active/inactive text color
+
2009-02-11 Andre Klapper <a9016009@gmx.de>
* /gui/migration.c:
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 263b72d7ad..efdc1cd958 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1237,7 +1237,7 @@ e_day_view_unrealize (GtkWidget *widget)
static GdkColor
e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *widget)
{
- GdkColor color, bg_color;
+ GdkColor bg_color;
guint16 red, green, blue;
gdouble cc = 65535.0;
@@ -1257,11 +1257,9 @@ e_day_view_get_text_color (EDayView *day_view, EDayViewEvent *event, GtkWidget *
}
if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
- color = widget->style->text[GTK_STATE_NORMAL];
+ return widget->style->black;
else
- color = widget->style->text[GTK_STATE_ACTIVE];
-
- return color;
+ return widget->style->white;
}
static void
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index f5c2577b8f..f9328f1c97 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -816,7 +816,7 @@ get_digit_width (PangoLayout *layout)
static GdkColor
e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidget *widget)
{
- GdkColor color, bg_color;
+ GdkColor bg_color;
guint16 red, green, blue;
gdouble cc = 65535.0;
@@ -836,11 +836,9 @@ e_week_view_get_text_color (EWeekView *week_view, EWeekViewEvent *event, GtkWidg
}
if ((red/cc > 0.7) || (green/cc > 0.7) || (blue/cc > 0.7 ))
- color = widget->style->text[GTK_STATE_NORMAL];
+ return widget->style->black;
else
- color = widget->style->text[GTK_STATE_ACTIVE];
-
- return color;
+ return widget->style->white;
}
static void