From f4f196c13303c1b71e75a48b89c4b0cd9e9a0cee Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 19 Nov 2001 22:39:03 +0000 Subject: [PATCH] Use the widget's state when drawing the indicator, as in GtkCheckButton. Mon Nov 19 17:34:40 2001 Owen Taylor * gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): Use the widget's state when drawing the indicator, as in GtkCheckButton. This gives us color changes for un-prelighted checkbuttons. (#63308, Matt Wilson) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkradiobutton.c | 1 + 8 files changed, 50 insertions(+) diff --git a/ChangeLog b/ChangeLog index f4505662d4..0658dd3ecb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Nov 19 17:34:40 2001 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use the widget's state when drawing the indicator, as + in GtkCheckButton. This gives us color changes for + un-prelighted checkbuttons. (#63308, Matt Wilson) + Mon Nov 19 17:11:23 2001 Owen Taylor (Fixes related to #64428, Michael Meeks) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f4505662d4..0658dd3ecb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Mon Nov 19 17:34:40 2001 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use the widget's state when drawing the indicator, as + in GtkCheckButton. This gives us color changes for + un-prelighted checkbuttons. (#63308, Matt Wilson) + Mon Nov 19 17:11:23 2001 Owen Taylor (Fixes related to #64428, Michael Meeks) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f4505662d4..0658dd3ecb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Mon Nov 19 17:34:40 2001 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use the widget's state when drawing the indicator, as + in GtkCheckButton. This gives us color changes for + un-prelighted checkbuttons. (#63308, Matt Wilson) + Mon Nov 19 17:11:23 2001 Owen Taylor (Fixes related to #64428, Michael Meeks) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f4505662d4..0658dd3ecb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Mon Nov 19 17:34:40 2001 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use the widget's state when drawing the indicator, as + in GtkCheckButton. This gives us color changes for + un-prelighted checkbuttons. (#63308, Matt Wilson) + Mon Nov 19 17:11:23 2001 Owen Taylor (Fixes related to #64428, Michael Meeks) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f4505662d4..0658dd3ecb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Mon Nov 19 17:34:40 2001 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use the widget's state when drawing the indicator, as + in GtkCheckButton. This gives us color changes for + un-prelighted checkbuttons. (#63308, Matt Wilson) + Mon Nov 19 17:11:23 2001 Owen Taylor (Fixes related to #64428, Michael Meeks) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f4505662d4..0658dd3ecb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Mon Nov 19 17:34:40 2001 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use the widget's state when drawing the indicator, as + in GtkCheckButton. This gives us color changes for + un-prelighted checkbuttons. (#63308, Matt Wilson) + Mon Nov 19 17:11:23 2001 Owen Taylor (Fixes related to #64428, Michael Meeks) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f4505662d4..0658dd3ecb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Mon Nov 19 17:34:40 2001 Owen Taylor + + * gtk/gtkradiobutton.c (gtk_radio_button_draw_indicator): + Use the widget's state when drawing the indicator, as + in GtkCheckButton. This gives us color changes for + un-prelighted checkbuttons. (#63308, Matt Wilson) + Mon Nov 19 17:11:23 2001 Owen Taylor (Fixes related to #64428, Michael Meeks) diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c index 9e6e169661..b1ce1e2eef 100644 --- a/gtk/gtkradiobutton.c +++ b/gtk/gtkradiobutton.c @@ -621,6 +621,7 @@ gtk_radio_button_draw_indicator (GtkCheckButton *check_button, x = widget->allocation.x + indicator_spacing + GTK_CONTAINER (widget)->border_width; y = widget->allocation.y + (widget->allocation.height - indicator_size) / 2; + state_type = GTK_WIDGET_STATE (widget) == GTK_STATE_ACTIVE ? GTK_STATE_NORMAL : GTK_WIDGET_STATE (widget); if (GTK_TOGGLE_BUTTON (widget)->active) shadow_type = GTK_SHADOW_IN; else