/
0011-gtk-add-event-handling-to-GtkScrolledWindow-s-overla.patch
614 lines (584 loc) · 23 KB
/
0011-gtk-add-event-handling-to-GtkScrolledWindow-s-overla.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
From 3b82f7c4ad5f81a786e1699497c6938d882ad9fc Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Tue, 10 Jul 2012 14:33:45 +0200
Subject: [PATCH 11/53] gtk: add event handling to GtkScrolledWindow's overlay
scrollbars
---
gtk/gtkscrolledwindow.c | 438 +++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 403 insertions(+), 35 deletions(-)
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index b015533..bf26969 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -84,6 +84,10 @@
#define OVERSHOOT_INVERSE_ACCELERATION 0.003
#define RELEASE_EVENT_TIMEOUT 1000
+/* Overlay scrollbars */
+#define SCROLL_INTERVAL_INITIAL 300
+#define SCROLL_INTERVAL_REPEAT 100
+
typedef struct {
gboolean window_placement_set;
GtkCornerType real_window_placement;
@@ -123,6 +127,19 @@ typedef struct {
gboolean sb_fading_in;
gint sb_fade_out_delay;
guint sb_fade_out_id;
+
+ gboolean sb_hovering;
+ gboolean sb_pointer_grabbed;
+ gboolean sb_grab_vscroll;
+ gboolean sb_grab_hscroll;
+ gboolean sb_drag_slider;
+ gboolean sb_visible;
+
+ gint sb_grab_offset_x;
+ gint sb_grab_offset_y;
+
+ gint sb_scroll_direction;
+ guint sb_scroll_timeout_id;
} GtkScrolledWindowPrivate;
#define GTK_SCROLLED_WINDOW_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_SCROLLED_WINDOW, GtkScrolledWindowPrivate))
@@ -219,8 +236,24 @@ static gboolean _gtk_scrolled_window_set_adjustment_value (GtkScrolledWindo
gboolean snap_to_border);
static void gtk_scrolled_window_cancel_animation (GtkScrolledWindow *scrolled_window);
+static void gtk_scrolled_window_start_fade_out_timeout (GtkScrolledWindow *scrolled_window);
+static void gtk_scrolled_window_stop_fade_out_timeout (GtkScrolledWindow *scrolled_window);
static void gtk_scrolled_window_start_fade_in_animation (GtkScrolledWindow *scrolled_window);
static void gtk_scrolled_window_start_fade_out_animation (GtkScrolledWindow *scrolled_window);
+static gboolean
+ gtk_scrolled_window_over_child_scroll_areas (GtkScrolledWindow *scrolled_window,
+ GdkEvent *event,
+ gint x,
+ gint y,
+ gboolean *over_vscroll,
+ gboolean *over_hscroll);
+static void gtk_scrolled_window_get_child_scroll_areas (GtkScrolledWindow *scrolled_window,
+ GtkWidget *child,
+ GdkWindow *child_window,
+ GdkRectangle *vbar_rect,
+ GdkRectangle *vslider_rect,
+ GdkRectangle *hbar_rect,
+ GdkRectangle *hslider_rect);
static gboolean gtk_scrolled_window_child_expose (GtkWidget *widget,
GdkEventExpose *eevent,
GtkScrolledWindow *scrolled_window);
@@ -2386,8 +2419,8 @@ gtk_scrolled_window_calculate_velocity (GtkScrolledWindow *scrolled_window,
}
static gboolean
-gtk_scrolled_window_captured_button_release (GtkWidget *widget,
- GdkEvent *event)
+gtk_scrolled_window_captured_button_release_kinetic (GtkWidget *widget,
+ GdkEvent *event)
{
GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
GtkScrolledWindowPrivate *priv;
@@ -2463,8 +2496,8 @@ gtk_scrolled_window_captured_button_release (GtkWidget *widget,
}
static gboolean
-gtk_scrolled_window_captured_motion_notify (GtkWidget *widget,
- GdkEvent *event)
+gtk_scrolled_window_captured_motion_notify_kinetic (GtkWidget *widget,
+ GdkEvent *event)
{
GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
GtkScrolledWindowPrivate *priv;
@@ -2555,8 +2588,8 @@ gtk_scrolled_window_captured_motion_notify (GtkWidget *widget,
}
static gboolean
-gtk_scrolled_window_captured_button_press (GtkWidget *widget,
- GdkEvent *event)
+gtk_scrolled_window_captured_button_press_kinetic (GtkWidget *widget,
+ GdkEvent *event)
{
GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
GtkScrolledWindowPrivate *priv;
@@ -2634,29 +2667,283 @@ gtk_scrolled_window_captured_button_press (GtkWidget *widget,
return FALSE;
}
+static void
+gtk_scrolled_window_scroll_step (GtkScrolledWindow *scrolled_window)
+{
+ GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (scrolled_window);
+ GtkAdjustment *adj;
+ gdouble value;
+
+ if (priv->sb_grab_vscroll)
+ {
+ adj = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar));
+ }
+ else if (priv->sb_grab_hscroll)
+ {
+ adj = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar));
+ }
+
+ value = adj->value + (priv->sb_scroll_direction * adj->page_size);
+ value = CLAMP (value, adj->lower, adj->upper - adj->page_size);
+
+ gtk_adjustment_set_value (adj, value);
+}
+
+static gboolean
+gtk_scrolled_window_scroll_step_timeout (gpointer data)
+{
+ GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (data);
+ GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (scrolled_window);
+
+ gtk_scrolled_window_scroll_step (scrolled_window);
+
+ g_source_remove (priv->sb_scroll_timeout_id);
+
+ priv->sb_scroll_timeout_id =
+ gdk_threads_add_timeout (SCROLL_INTERVAL_REPEAT,
+ gtk_scrolled_window_scroll_step_timeout,
+ scrolled_window);
+
+ return FALSE;
+}
+
+static gboolean
+gtk_scrolled_window_captured_button_press_scrollbar (GtkWidget *widget,
+ GdkEvent *event)
+{
+ GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
+ GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (scrolled_window);
+ GdkEventButton *bevent = (GdkEventButton *) event;
+
+ if (bevent->button != 1)
+ return FALSE;
+
+ if (gtk_scrolled_window_over_child_scroll_areas (scrolled_window, event,
+ bevent->x, bevent->y,
+ &priv->sb_grab_vscroll,
+ &priv->sb_grab_hscroll))
+ {
+ GdkRectangle vbar_rect;
+ GdkRectangle vslider_rect;
+ GdkRectangle hbar_rect;
+ GdkRectangle hslider_rect;
+
+ priv->sb_pointer_grabbed = TRUE;
+ gtk_grab_add (widget);
+
+ gtk_scrolled_window_get_child_scroll_areas (scrolled_window,
+ gtk_bin_get_child (GTK_BIN (widget)),
+ bevent->window,
+ &vbar_rect, &vslider_rect,
+ &hbar_rect, &hslider_rect);
+
+ if (priv->sb_grab_vscroll)
+ {
+ /* we consider the entire width of the scrollbar clickable */
+ vslider_rect.x = vbar_rect.x;
+ vslider_rect.width = vbar_rect.width;
+
+ if (bevent->x >= vslider_rect.x &&
+ bevent->x < (vslider_rect.x + vslider_rect.width) &&
+ bevent->y >= vslider_rect.y &&
+ bevent->y < (vslider_rect.y + vslider_rect.height))
+ {
+ priv->sb_drag_slider = TRUE;
+ priv->sb_grab_offset_y = bevent->y - vslider_rect.y;
+ }
+ else
+ {
+ priv->sb_drag_slider = FALSE;
+ priv->sb_grab_offset_y = bevent->y - vbar_rect.y;
+
+ if (bevent->y < vslider_rect.y)
+ priv->sb_scroll_direction = -1;
+ else
+ priv->sb_scroll_direction = 1;
+ }
+ }
+ else if (priv->sb_grab_hscroll)
+ {
+ /* we consider the entire height of the scrollbar clickable */
+ hslider_rect.y = hbar_rect.y;
+ hslider_rect.height = hbar_rect.height;
+
+ if (bevent->x >= hslider_rect.x &&
+ bevent->x < (hslider_rect.x + hslider_rect.width) &&
+ bevent->y >= hslider_rect.y &&
+ bevent->y < (hslider_rect.y + hslider_rect.height))
+ {
+ priv->sb_drag_slider = TRUE;
+ priv->sb_grab_offset_x = bevent->x - hslider_rect.x;
+ }
+ else
+ {
+ priv->sb_drag_slider = FALSE;
+ priv->sb_grab_offset_x = bevent->x - hbar_rect.x;
+
+ if (bevent->x < hslider_rect.x)
+ priv->sb_scroll_direction = -1;
+ else
+ priv->sb_scroll_direction = 1;
+ }
+ }
+
+ if ((priv->sb_grab_vscroll || priv->sb_grab_hscroll) &&
+ !priv->sb_drag_slider)
+ {
+ gtk_scrolled_window_scroll_step (scrolled_window);
+
+ priv->sb_scroll_timeout_id =
+ gdk_threads_add_timeout (SCROLL_INTERVAL_INITIAL,
+ gtk_scrolled_window_scroll_step_timeout,
+ scrolled_window);
+ }
+
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static gboolean
+gtk_scrolled_window_captured_button_release_scrollbar (GtkWidget *widget,
+ GdkEvent *event)
+{
+ GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
+ GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (scrolled_window);
+ GdkEventButton *bevent = (GdkEventButton *) event;
+
+ if (bevent->button != 1)
+ return FALSE;
+
+ gtk_grab_remove (widget);
+ priv->sb_pointer_grabbed = FALSE;
+
+ if (priv->sb_scroll_timeout_id)
+ {
+ g_source_remove (priv->sb_scroll_timeout_id);
+ priv->sb_scroll_timeout_id = 0;
+ }
+
+ return TRUE;
+}
+
+static gboolean
+gtk_scrolled_window_captured_motion_notify_scrollbar (GtkWidget *widget,
+ GdkEvent *event)
+{
+ GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
+ GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (scrolled_window);
+ GdkEventMotion *mevent = (GdkEventMotion *) event;
+
+ if (priv->sb_pointer_grabbed)
+ {
+ if (priv->sb_drag_slider)
+ {
+ GdkRectangle vbar_rect;
+ GdkRectangle vslider_rect;
+ GdkRectangle hbar_rect;
+ GdkRectangle hslider_rect;
+ GtkAdjustment *adj;
+ gint pos;
+ gint visible_range;
+ gdouble value;
+
+ gtk_scrolled_window_get_child_scroll_areas (scrolled_window,
+ gtk_bin_get_child (GTK_BIN (widget)),
+ mevent->window,
+ &vbar_rect, &vslider_rect,
+ &hbar_rect, &hslider_rect);
+
+ if (priv->sb_grab_vscroll)
+ {
+ adj = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar));
+ pos = mevent->y - priv->sb_grab_offset_y - vbar_rect.y;
+ visible_range = vbar_rect.height - vslider_rect.height;
+ }
+ else if (priv->sb_grab_hscroll)
+ {
+ adj = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar));
+ pos = mevent->x - priv->sb_grab_offset_x - hbar_rect.x;
+ visible_range = hbar_rect.width - hslider_rect.width;
+ }
+
+ pos = CLAMP (pos, 0, visible_range);
+
+ value = (adj->upper - adj->page_size - adj->lower) * pos / visible_range;
+
+ gtk_adjustment_set_value (adj, value);
+ }
+
+ return TRUE;
+ }
+ else
+ {
+ if (gtk_scrolled_window_over_child_scroll_areas (scrolled_window, event,
+ mevent->x, mevent->y,
+ NULL, NULL))
+ {
+ priv->sb_hovering = TRUE;
+ priv->sb_visible = TRUE;
+
+ gtk_scrolled_window_start_fade_in_animation (scrolled_window);
+ gtk_scrolled_window_stop_fade_out_timeout (scrolled_window);
+
+ /* needed when entering the scrollbar */
+ gtk_scrolled_window_expose_scrollbars (NULL, scrolled_window);
+
+ return TRUE;
+ }
+
+ priv->sb_hovering = FALSE;
+
+ if (priv->sb_visible || gtk_adjustment_get_value (priv->opacity) > 0.0)
+ {
+ /* keep visible scrollbars visible while the mouse is moving */
+ gtk_scrolled_window_start_fade_in_animation (scrolled_window);
+ gtk_scrolled_window_stop_fade_out_timeout (scrolled_window);
+ gtk_scrolled_window_start_fade_out_timeout (scrolled_window);
+ }
+
+ return FALSE;
+ }
+}
+
static gboolean
gtk_scrolled_window_captured_event (GtkWidget *widget,
GdkEvent *event)
{
- gboolean retval = FALSE;
+ GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (widget);
+ gboolean retval = FALSE;
switch (event->type)
{
case GDK_BUTTON_PRESS:
- retval = gtk_scrolled_window_captured_button_press (widget, event);
+ retval = gtk_scrolled_window_captured_button_press_scrollbar (widget, event);
+ if (!retval)
+ retval = gtk_scrolled_window_captured_button_press_kinetic (widget, event);
break;
case GDK_BUTTON_RELEASE:
- if (priv->pointer_grabbed)
- retval = gtk_scrolled_window_captured_button_release (widget, event);
+ if (priv->sb_pointer_grabbed)
+ retval = gtk_scrolled_window_captured_button_release_scrollbar (widget, event);
+ else if (priv->pointer_grabbed)
+ retval = gtk_scrolled_window_captured_button_release_kinetic (widget, event);
else
priv->last_button_event_valid = FALSE;
break;
case GDK_MOTION_NOTIFY:
- if (priv->pointer_grabbed)
- retval = gtk_scrolled_window_captured_motion_notify (widget, event);
+ if (priv->sb_pointer_grabbed || !priv->pointer_grabbed)
+ retval = gtk_scrolled_window_captured_motion_notify_scrollbar (widget, event);
+ else if (priv->pointer_grabbed)
+ retval = gtk_scrolled_window_captured_motion_notify_kinetic (widget, event);
break;
case GDK_LEAVE_NOTIFY:
+ if (!priv->in_drag && !priv->sb_pointer_grabbed)
+ {
+ gtk_scrolled_window_start_fade_out_timeout (scrolled_window);
+ priv->sb_hovering = FALSE;
+ }
case GDK_ENTER_NOTIFY:
if (priv->in_drag &&
event->crossing.mode != GDK_CROSSING_GRAB)
@@ -3017,6 +3304,17 @@ gtk_scrolled_window_grab_notify (GtkWidget *widget,
priv->last_button_event_valid = FALSE;
}
+
+ if (priv->sb_pointer_grabbed && !was_grabbed)
+ {
+ priv->sb_pointer_grabbed = FALSE;
+
+ if (priv->sb_scroll_timeout_id)
+ {
+ g_source_remove (priv->sb_scroll_timeout_id);
+ priv->sb_scroll_timeout_id = 0;
+ }
+ }
}
static void
@@ -3058,6 +3356,56 @@ gtk_scrolled_window_rounded_rectangle (cairo_t *cr,
cairo_close_path (cr);
}
+static gboolean
+gtk_scrolled_window_over_child_scroll_areas (GtkScrolledWindow *scrolled_window,
+ GdkEvent *event,
+ gint x,
+ gint y,
+ gboolean *over_vscroll,
+ gboolean *over_hscroll)
+{
+ GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (scrolled_window);
+ GtkWidget *child;
+ GdkRectangle vbar_rect;
+ GdkRectangle hbar_rect;
+ gboolean over_v = FALSE;
+ gboolean over_h = FALSE;
+
+ child = gtk_bin_get_child (GTK_BIN (scrolled_window));
+ if (!child)
+ return FALSE;
+
+ if (gtk_get_event_widget (event) != child)
+ return FALSE;
+
+ if (gtk_adjustment_get_value (priv->opacity) == 0.0)
+ return FALSE;
+
+ gtk_scrolled_window_get_child_scroll_areas (scrolled_window,
+ child,
+ ((GdkEventAny *) event)->window,
+ &vbar_rect, NULL,
+ &hbar_rect, NULL);
+
+ if (vbar_rect.width > 0 &&
+ x >= vbar_rect.x && x < (vbar_rect.x + vbar_rect.width) &&
+ y >= vbar_rect.y && y < (vbar_rect.y + vbar_rect.height))
+ {
+ over_v = TRUE;
+ }
+ else if (hbar_rect.width > 0 &&
+ x >= hbar_rect.x && x < (hbar_rect.x + hbar_rect.width) &&
+ y >= hbar_rect.y && y < (hbar_rect.y + hbar_rect.height))
+ {
+ over_h = TRUE;
+ }
+
+ if (over_vscroll) *over_vscroll = over_v;
+ if (over_hscroll) *over_hscroll = over_h;
+
+ return over_v || over_h;
+}
+
static void
gtk_scrolled_window_get_child_scroll_areas (GtkScrolledWindow *scrolled_window,
GtkWidget *child,
@@ -3084,6 +3432,8 @@ gtk_scrolled_window_get_child_scroll_areas (GtkScrolledWindow *scrolled_window,
gint window_height;
gint viewport_width;
gint viewport_height;
+ gint offset_x = 0;
+ gint offset_y = 0;
window_width = gdk_window_get_width (child_window);
window_height = gdk_window_get_height (child_window);
@@ -3107,6 +3457,12 @@ gtk_scrolled_window_get_child_scroll_areas (GtkScrolledWindow *scrolled_window,
value_h = gtk_adjustment_get_value (adj);
}
+ if (window_width > allocation.width)
+ offset_x = value_h;
+
+ if (window_height > allocation.height)
+ offset_y = value_v;
+
if ((vbar_rect || vslider_rect) && scrolled_window->vscrollbar)
{
adj = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar));
@@ -3128,16 +3484,13 @@ gtk_scrolled_window_get_child_scroll_areas (GtkScrolledWindow *scrolled_window,
y = ratio * (viewport_height - (2 * priv->sb_padding) - height) + priv->sb_padding;
x = viewport_width - priv->sb_width - priv->sb_padding;
- if (window_width > allocation.width)
- x += value_h;
-
- if (window_height > allocation.height)
- y += value_v;
+ x += offset_x;
+ y += offset_y;
if (vbar_rect)
{
vbar_rect->x = x - priv->sb_padding;
- vbar_rect->y = 0;
+ vbar_rect->y = offset_y;
vbar_rect->width = priv->sb_width + 2 * priv->sb_padding;
vbar_rect->height = viewport_height;
}
@@ -3191,15 +3544,12 @@ gtk_scrolled_window_get_child_scroll_areas (GtkScrolledWindow *scrolled_window,
x = ratio * (viewport_width - (2 * priv->sb_padding) - width) + priv->sb_padding;
y = viewport_height - priv->sb_width - priv->sb_padding;
- if (window_width > allocation.width)
- x += value_h;
-
- if (window_height > allocation.height)
- y += value_v;
+ x += offset_x;
+ y += offset_y;
if (hbar_rect)
{
- hbar_rect->x = 0;
+ hbar_rect->x = offset_x;
hbar_rect->y = y - priv->sb_padding;
hbar_rect->width = viewport_width;
hbar_rect->height = priv->sb_width + 2 * priv->sb_padding;
@@ -3256,7 +3606,7 @@ gtk_scrolled_window_child_expose (GtkWidget *widget,
&vbar_rect, &vslider_rect,
&hbar_rect, &hslider_rect);
- if (TRUE)
+ if (priv->sb_visible)
{
if (scrolled_window->vscrollbar && vbar_rect.width > 0)
gdk_cairo_rectangle (cr, &vbar_rect);
@@ -3264,7 +3614,7 @@ gtk_scrolled_window_child_expose (GtkWidget *widget,
if (scrolled_window->hscrollbar && hbar_rect.width > 0)
gdk_cairo_rectangle (cr, &hbar_rect);
- cairo_set_source_rgba (cr, 0, 0, 0, 0.2);
+ cairo_set_source_rgba (cr, 0, 0, 0, gtk_adjustment_get_value (priv->opacity) / 2.0);
cairo_fill (cr);
}
@@ -3308,11 +3658,7 @@ gtk_scrolled_window_cancel_animation (GtkScrolledWindow *scrolled_window)
_gb_animation_stop (anim);
}
- if (priv->sb_fade_out_id)
- {
- g_source_remove (priv->sb_fade_out_id);
- priv->sb_fade_out_id = 0;
- }
+ gtk_scrolled_window_stop_fade_out_timeout (scrolled_window);
priv->sb_fading_in = FALSE;
}
@@ -3326,6 +3672,30 @@ gtk_scrolled_window_fade_out_timeout (GtkScrolledWindow *scrolled_window)
}
static void
+gtk_scrolled_window_start_fade_out_timeout (GtkScrolledWindow *scrolled_window)
+{
+ GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (scrolled_window);
+
+ if (! priv->sb_fade_out_id)
+ priv->sb_fade_out_id =
+ gdk_threads_add_timeout (priv->sb_fade_out_delay,
+ (GSourceFunc) gtk_scrolled_window_fade_out_timeout,
+ scrolled_window);
+}
+
+static void
+gtk_scrolled_window_stop_fade_out_timeout (GtkScrolledWindow *scrolled_window)
+{
+ GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (scrolled_window);
+
+ if (priv->sb_fade_out_id)
+ {
+ g_source_remove (priv->sb_fade_out_id);
+ priv->sb_fade_out_id = 0;
+ }
+}
+
+static void
gtk_scrolled_window_start_fade_in_animation (GtkScrolledWindow *scrolled_window)
{
GtkScrolledWindowPrivate *priv = GTK_SCROLLED_WINDOW_GET_PRIVATE (scrolled_window);
@@ -3337,6 +3707,7 @@ gtk_scrolled_window_start_fade_in_animation (GtkScrolledWindow *scrolled_window)
gtk_scrolled_window_cancel_animation (scrolled_window);
priv->sb_fading_in = TRUE;
+ priv->sb_visible = priv->sb_hovering;
upper = gtk_adjustment_get_upper (priv->opacity);
priv->opacity_anim = _gb_object_animate (priv->opacity,
@@ -3347,10 +3718,7 @@ gtk_scrolled_window_start_fade_in_animation (GtkScrolledWindow *scrolled_window)
g_object_add_weak_pointer (G_OBJECT (priv->opacity_anim),
(gpointer *) &priv->opacity_anim);
- priv->sb_fade_out_id =
- gdk_threads_add_timeout (priv->sb_fade_out_delay,
- (GSourceFunc) gtk_scrolled_window_fade_out_timeout,
- scrolled_window);
+ gtk_scrolled_window_start_fade_out_timeout (scrolled_window);
}
static void
--
1.7.10.2 (Apple Git-33)