Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from trunk (#445196):

Browse Source 
2007-06-07  Yevgen Muntyan  <muntyan@tamu.edu>

	Merge from trunk (#445196):

	* 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=/branches/gtk-2-10/; revision=18078
This commit is contained in:
Yevgen Muntyan
2007-06-07 20:06:41 +00:00
committed by Yevgen Muntyan
parent 3de3ff0f08
commit 320f2ba885
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2007-06-07 Yevgen Muntyan <muntyan@tamu.edu>
Merge from trunk (#445196):
* 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-06 Johan Dahlin <jdahlin@async.com.br>
Merge from trunk:

14
gtk/gtkstyle.c
View File

@@ -6632,24 +6632,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;
}
}