1 diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
2 index a643b7d..02920ce 100644
3 --- a/gtk/gtkscrolledwindow.c
4 +++ b/gtk/gtkscrolledwindow.c
5 @@ -282,6 +282,10 @@ static gboolean gtk_scrolled_window_calculate_velocity (GtkScrolledWindow *scro
7 static void gtk_scrolled_window_init_overlay_scrollbars (GtkScrolledWindow *window);
9 +static void gtk_scrolled_window_style_changed (GtkWidget *widget,
10 + GParamSpec *property,
11 + gpointer user_data);
12 +static void update_overlay_scrollbar_color (GtkWidget *widget);
14 static guint signals[LAST_SIGNAL] = {0};
16 @@ -1149,7 +1153,7 @@ gtk_scrolled_window_set_property (GObject *object,
19 GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (object);
24 case PROP_HADJUSTMENT:
25 @@ -1457,7 +1461,6 @@ gtk_scrolled_window_expose (GtkWidget *widget,
26 GdkEventExpose *event)
28 GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
29 - GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (widget);
31 if (gtk_widget_is_drawable (widget))
33 @@ -3085,6 +3088,11 @@ gtk_scrolled_window_add (GtkContainer *container,
35 gtk_widget_set_parent (child, GTK_WIDGET (bin));
37 + g_signal_connect (scrolled_window,
39 + G_CALLBACK (gtk_scrolled_window_style_changed),
42 /* this is a temporary message */
43 if (!gtk_widget_set_scroll_adjustments (child,
44 gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar)),
45 @@ -3224,6 +3232,43 @@ _gtk_scrolled_window_get_scrollbar_spacing (GtkScrolledWindow *scrolled_window)
49 +gtk_scrolled_window_style_changed (GtkWidget *widget,
50 + GParamSpec *property,
53 + update_overlay_scrollbar_color (widget);
57 +update_overlay_scrollbar_color (GtkWidget *widget)
59 + GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (widget);
66 + style = gtk_widget_get_style (widget);
67 + c = style->bg[GTK_STATE_NORMAL];
70 + g = (gdouble)c.green;
71 + b = (gdouble)c.blue;
73 + brightness = (int)(sqrt (r * r * 0.241 +
75 + b * b * 0.068) / 256.0);
77 + cc = brightness < 130 ? 1.0 : 0.0;
79 + [priv->vbar_layer setBackgroundColor: CGColorCreateGenericRGB (cc, cc, cc, 0.5)];
80 + [priv->vslider_layer setBackgroundColor: CGColorCreateGenericRGB (cc, cc, cc, 1.0)];
81 + [priv->hbar_layer setBackgroundColor: CGColorCreateGenericRGB (cc, cc, cc, 0.5)];
82 + [priv->hslider_layer setBackgroundColor: CGColorCreateGenericRGB (cc, cc, cc, 1.0)];
86 gtk_scrolled_window_realize (GtkWidget *widget)
88 GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
89 @@ -3313,21 +3358,22 @@ gtk_scrolled_window_realize (GtkWidget *widget)
90 parent_layer = [layer_view layer];
92 priv->vbar_layer = [[CALayer layer] retain];
93 - priv->vbar_layer.backgroundColor = CGColorCreateGenericRGB (0.0, 0.0, 0.0, 0.5);
94 priv->vbar_layer.hidden = YES;
96 priv->vslider_layer = [[CALayer layer] retain];
97 - priv->vslider_layer.backgroundColor = CGColorCreateGenericRGB (0.0, 0.0, 0.0, 1.0);
98 priv->vslider_layer.hidden = YES;
100 priv->hbar_layer = [[CALayer layer] retain];
101 - priv->hbar_layer.backgroundColor = CGColorCreateGenericRGB (0.0, 0.0, 0.0, 0.5);
102 priv->hbar_layer.hidden = YES;
104 priv->hslider_layer = [[CALayer layer] retain];
105 - priv->hslider_layer.backgroundColor = CGColorCreateGenericRGB (0.0, 0.0, 0.0, 1.0);
106 priv->hslider_layer.hidden = YES;
108 + priv->vbar_layer.backgroundColor = CGColorCreateGenericRGB (0, 0, 0, 0.5);
109 + priv->vslider_layer.backgroundColor = CGColorCreateGenericRGB (0, 0, 0, 1.0);
110 + priv->hbar_layer.backgroundColor = CGColorCreateGenericRGB (0, 0, 0, 0.5);
111 + priv->hslider_layer.backgroundColor = CGColorCreateGenericRGB (0, 0, 0, 1.0);
113 [parent_layer addSublayer:priv->vbar_layer];
114 [parent_layer addSublayer:priv->vslider_layer];