Commit 46afb008 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Use GTK_STATE_INSENSITIVE for the foreground of cells for CLists in the

Thu Dec  3 16:37:42 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
	for the foreground of cells for CLists in the insensitive
	state, instead of GTK_STATE_PRELIGHT.
parent 1ec67335
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
for the foreground of cells for CLists in the insensitive
state, instead of GTK_STATE_PRELIGHT.
Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org> Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c: moved checks upon focus setting from * gtk/gtkwindow.c: moved checks upon focus setting from
......
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
for the foreground of cells for CLists in the insensitive
state, instead of GTK_STATE_PRELIGHT.
Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org> Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c: moved checks upon focus setting from * gtk/gtkwindow.c: moved checks upon focus setting from
......
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
for the foreground of cells for CLists in the insensitive
state, instead of GTK_STATE_PRELIGHT.
Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org> Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c: moved checks upon focus setting from * gtk/gtkwindow.c: moved checks upon focus setting from
......
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
for the foreground of cells for CLists in the insensitive
state, instead of GTK_STATE_PRELIGHT.
Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org> Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c: moved checks upon focus setting from * gtk/gtkwindow.c: moved checks upon focus setting from
......
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
for the foreground of cells for CLists in the insensitive
state, instead of GTK_STATE_PRELIGHT.
Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org> Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c: moved checks upon focus setting from * gtk/gtkwindow.c: moved checks upon focus setting from
......
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
for the foreground of cells for CLists in the insensitive
state, instead of GTK_STATE_PRELIGHT.
Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org> Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c: moved checks upon focus setting from * gtk/gtkwindow.c: moved checks upon focus setting from
......
Thu Dec 3 16:37:42 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c (get_cell_style): Use GTK_STATE_INSENSITIVE
for the foreground of cells for CLists in the insensitive
state, instead of GTK_STATE_PRELIGHT.
Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org> Thu Dec 3 06:20:59 1998 Tim Janik <timj@gtk.org>
* gtk/gtkwindow.c: moved checks upon focus setting from * gtk/gtkwindow.c: moved checks upon focus setting from
......
...@@ -5401,12 +5401,20 @@ get_cell_style (GtkCList *clist, ...@@ -5401,12 +5401,20 @@ get_cell_style (GtkCList *clist,
GdkGC **fg_gc, GdkGC **fg_gc,
GdkGC **bg_gc) GdkGC **bg_gc)
{ {
gint fg_state;
if ((state == GTK_STATE_PRELIGHT) &&
(GTK_WIDGET (clist)->state == GTK_STATE_INSENSITIVE))
fg_state = GTK_STATE_INSENSITIVE;
else
fg_state = state;
if (clist_row->cell[column].style) if (clist_row->cell[column].style)
{ {
if (style) if (style)
*style = clist_row->cell[column].style; *style = clist_row->cell[column].style;
if (fg_gc) if (fg_gc)
*fg_gc = clist_row->cell[column].style->fg_gc[state]; *fg_gc = clist_row->cell[column].style->fg_gc[fg_state];
if (bg_gc) if (bg_gc)
*bg_gc = clist_row->cell[column].style->bg_gc[state]; *bg_gc = clist_row->cell[column].style->bg_gc[state];
} }
...@@ -5415,7 +5423,7 @@ get_cell_style (GtkCList *clist, ...@@ -5415,7 +5423,7 @@ get_cell_style (GtkCList *clist,
if (style) if (style)
*style = clist_row->style; *style = clist_row->style;
if (fg_gc) if (fg_gc)
*fg_gc = clist_row->style->fg_gc[state]; *fg_gc = clist_row->style->fg_gc[fg_state];
if (bg_gc) if (bg_gc)
*bg_gc = clist_row->style->bg_gc[state]; *bg_gc = clist_row->style->bg_gc[state];
} }
...@@ -5424,7 +5432,7 @@ get_cell_style (GtkCList *clist, ...@@ -5424,7 +5432,7 @@ get_cell_style (GtkCList *clist,
if (style) if (style)
*style = GTK_WIDGET (clist)->style; *style = GTK_WIDGET (clist)->style;
if (fg_gc) if (fg_gc)
*fg_gc = GTK_WIDGET (clist)->style->fg_gc[state]; *fg_gc = GTK_WIDGET (clist)->style->fg_gc[fg_state];
if (bg_gc) if (bg_gc)
*bg_gc = GTK_WIDGET (clist)->style->bg_gc[state]; *bg_gc = GTK_WIDGET (clist)->style->bg_gc[state];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment