AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-19 21:40:22 +00:00
Code Issues Projects Releases Wiki Activity

use text colors from widget style to draw cursor instead of hardcoded

Browse Source 
2007-05-31  Yevgen Muntyan  <muntyan@tamu.edu>

	* gtk/gtkstyle.c (get_insertion_cursor_gc): use text colors from
	widget style to draw cursor instead of hardcoded black and grey
	(#79585, comment #30).


svn path=/trunk/; revision=17998
This commit is contained in:
Yevgen Muntyan 2007-06-01 05:02:05 +00:00 committed by Yevgen Muntyan
parent 5fc26ddab7
commit 405df7f7db
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-05-31 Yevgen Muntyan <muntyan@tamu.edu>
* gtk/gtkstyle.c (get_insertion_cursor_gc): use text colors from
widget style to draw cursor instead of hardcoded black and grey
(#79585, comment #30).
2007-06-01 Kristian Rietveld <kris@gtk.org>
* gtk/gtkcellrenderertext.c (get_size): transform the ink_rect using

14
gtk/gtkstyle.c
View File

@ -6641,24 +6641,26 @@ get_insertion_cursor_gc (GtkWidget *widget,
}
}
/* Cursors in text widgets are drawn only in NORMAL state,
* so we can use text[GTK_STATE_NORMAL] as text color here */
if (is_primary)
{
if (!cursor_info->primary_gc)
cursor_info->primary_gc = make_cursor_gc (widget,
"cursor-color",
&widget->style->black);
&widget->style->text[GTK_STATE_NORMAL]);
return cursor_info->primary_gc;
}
else
{
static const GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
if (!cursor_info->secondary_gc)
cursor_info->secondary_gc = make_cursor_gc (widget,
"secondary-cursor-color",
&gray);
/* text_aa is the average of text and base colors,
* in usual black-on-white case it's grey. */
&widget->style->text_aa[GTK_STATE_NORMAL]);
return cursor_info->secondary_gc;
}
}