From 9f1f63df0182498888419dcb48c2e435e9e923cc Mon Sep 17 00:00:00 2001
From: "bryner%netscape.com" <bryner%netscape.com>
Date: Wed, 21 May 2003 03:06:42 +0000
Subject: [PATCH] Don't draw buttons as active when they are disabled.  But
 195881, r=blizzard, sr=jag, a=sspitzer.

---
 gfx/src/gtk/gtkdrawing.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gfx/src/gtk/gtkdrawing.c b/gfx/src/gtk/gtkdrawing.c
index ab00801bee9d..ccda7603d90f 100644
--- a/gfx/src/gtk/gtkdrawing.c
+++ b/gfx/src/gtk/gtkdrawing.c
@@ -290,9 +290,9 @@ moz_gtk_button_paint(GdkDrawable* drawable, GdkRectangle* rect,
     width -= 2;
     height -= 2;
   }
-	
-  shadow_type = (state->active && state->inHover) ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
-  
+
+  shadow_type = (state->active && state->inHover && !state->disabled) ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
+
   if (relief != GTK_RELIEF_NONE || (button_state != GTK_STATE_NORMAL &&
                                     button_state != GTK_STATE_INSENSITIVE)) {
     TSOffsetStyleGCs(style, x, y);
@@ -434,7 +434,7 @@ moz_gtk_scrollbar_button_paint(GdkDrawable* drawable, GdkRectangle* rect,
                                GtkArrowType type)
 {
   GtkStateType state_type = ConvertGtkState(state);
-  GtkShadowType shadow_type = (state->active) ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
+  GtkShadowType shadow_type = (state->active && !state->disabled) ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
   GdkRectangle arrow_rect;
   GtkStyle* style;
 
@@ -569,7 +569,7 @@ moz_gtk_dropdown_arrow_paint(GdkDrawable* drawable, GdkRectangle* rect,
 {
   GdkRectangle arrow_rect, real_arrow_rect;
   GtkStateType state_type = ConvertGtkState(state);
-  GtkShadowType shadow_type = state->active ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
+  GtkShadowType shadow_type = (state->active && !state->disabled) ? GTK_SHADOW_IN : GTK_SHADOW_OUT;
   GtkStyle* style;
 
   ensure_arrow_widget();