aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2003-05-20 02:41:24 +0800
committerChris Toshok <toshok@src.gnome.org>2003-05-20 02:41:24 +0800
commit2d3e30b912bf3c5a9473bd1b53de75752b9ec89c (patch)
treeee6eeeba71661473ce9cbfbc0dabde7fc89fcd55
parentfcb80018c0097bbf9b32a0cc66513ecc3428ee30 (diff)
downloadgsoc2013-evolution-2d3e30b912bf3c5a9473bd1b53de75752b9ec89c.tar.gz
gsoc2013-evolution-2d3e30b912bf3c5a9473bd1b53de75752b9ec89c.tar.zst
gsoc2013-evolution-2d3e30b912bf3c5a9473bd1b53de75752b9ec89c.zip
if we've got focus, set the background of the rect to bg[NORMAL], and the
2003-05-19 Chris Toshok <toshok@ximian.com> * gui/widgets/e-minicard-label.c (set_colors): if we've got focus, set the background of the rect to bg[NORMAL], and the fill color of the text and label to text[NORMAL]. This will make the background a different color than the canvas, but won't make it use the selected background. fixes #42472 svn path=/trunk/; revision=21262
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/gui/widgets/e-minicard-label.c6
2 files changed, 11 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index c779e6014b..3e300ed0ef 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,13 @@
2003-05-19 Chris Toshok <toshok@ximian.com>
+ * gui/widgets/e-minicard-label.c (set_colors): if we've got focus,
+ set the background of the rect to bg[NORMAL], and the fill color
+ of the text and label to text[NORMAL]. This will make the
+ background a different color than the canvas, but won't make it
+ use the selected background. fixes #42472
+
+2003-05-19 Chris Toshok <toshok@ximian.com>
+
* gui/merging/e-card-merging.c (e_card_merging_book_commit_card):
add a g_object_ref(card), to match the one in
e_card_merging_book_add_card. Fixes #43175.
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index fe44b6b9e4..607170aea4 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -419,15 +419,15 @@ set_colors (EMinicardLabel *label)
if (label->has_focus) {
gnome_canvas_item_set (label->rect,
"outline_color_gdk", &style->mid[GTK_STATE_SELECTED],
- "fill_color_gdk", &style->bg[GTK_STATE_SELECTED],
+ "fill_color_gdk", &style->bg[GTK_STATE_NORMAL],
NULL);
gnome_canvas_item_set (label->field,
- "fill_color_gdk", &canvas->style->text[GTK_STATE_SELECTED],
+ "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
NULL);
gnome_canvas_item_set (label->fieldname,
- "fill_color_gdk", &canvas->style->text[GTK_STATE_SELECTED],
+ "fill_color_gdk", &canvas->style->text[GTK_STATE_NORMAL],
NULL);
}
else {