overlay-scrollbar

Merge lp:~azzar1/overlay-scrollbar/deprecated-api into lp:overlay-scrollbar

  1. deprecated-api
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Andrea Cimitan
Approved revision: 242
Merged at revision: 242
Proposed branch: lp:~azzar1/overlay-scrollbar/deprecated-api
Merge into: lp:overlay-scrollbar
Diff against target: 266 lines (+67/-45)
3 files modified
os/os-scrollbar.c (+56/-40)
os/os-thumb.c (+10/-3)
os/os-utils.h (+1/-2)
To merge this branch: bzr merge lp:~azzar1/overlay-scrollbar/deprecated-api
Reviewer Review Type Date Requested Status
Andrea Cimitan Approve
Review via email: mp+61581@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

Well done Andrea! many thanks, looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'os/os-scrollbar.c'
2--- os/os-scrollbar.c 2011-05-18 18:35:34 +0000
3+++ os/os-scrollbar.c 2011-05-19 14:54:29 +0000
4@@ -134,9 +134,10 @@
5 * total_adjustment_range) times the trough height in pixels
6 */
7
8- if (priv->adjustment->upper - priv->adjustment->lower != 0)
9- height = ((bottom - top) * (priv->adjustment->page_size /
10- (priv->adjustment->upper - priv->adjustment->lower)));
11+ if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) != 0)
12+ height = ((bottom - top) * (gtk_adjustment_get_page_size (priv->adjustment) /
13+ (gtk_adjustment_get_upper (priv->adjustment) -
14+ gtk_adjustment_get_lower (priv->adjustment))));
15 else
16 height = gtk_range_get_min_slider_size (GTK_RANGE (scrollbar));
17
18@@ -146,9 +147,12 @@
19
20 y = top;
21
22- if (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size != 0)
23- y += (bottom - top - height) * ((adjustment_value - priv->adjustment->lower) /
24- (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size));
25+ if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) -
26+ gtk_adjustment_get_page_size (priv->adjustment) != 0)
27+ y += (bottom - top - height) * ((adjustment_value - gtk_adjustment_get_lower (priv->adjustment)) /
28+ (gtk_adjustment_get_upper (priv->adjustment) -
29+ gtk_adjustment_get_lower (priv->adjustment) -
30+ gtk_adjustment_get_page_size (priv->adjustment)));
31
32 y = CLAMP (y, top, bottom);
33
34@@ -166,9 +170,10 @@
35 * total_adjustment_range) times the trough width in pixels
36 */
37
38- if (priv->adjustment->upper - priv->adjustment->lower != 0)
39- width = ((right - left) * (priv->adjustment->page_size /
40- (priv->adjustment->upper - priv->adjustment->lower)));
41+ if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) != 0)
42+ width = ((right - left) * (gtk_adjustment_get_page_size (priv->adjustment) /
43+ (gtk_adjustment_get_upper (priv->adjustment) -
44+ gtk_adjustment_get_lower (priv->adjustment))));
45 else
46 width = gtk_range_get_min_slider_size (GTK_RANGE (scrollbar));
47
48@@ -178,9 +183,12 @@
49
50 x = left;
51
52- if (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size != 0)
53- x += (right - left - width) * ((adjustment_value - priv->adjustment->lower) /
54- (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size));
55+ if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) -
56+ gtk_adjustment_get_page_size (priv->adjustment) != 0)
57+ x += (right - left - width) * ((adjustment_value - gtk_adjustment_get_lower (priv->adjustment)) /
58+ (gtk_adjustment_get_upper (priv->adjustment) -
59+ gtk_adjustment_get_lower (priv->adjustment) -
60+ gtk_adjustment_get_page_size (priv->adjustment)));
61
62 x = CLAMP (x, left, right);
63
64@@ -211,9 +219,12 @@
65
66 y = top;
67
68- if (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size != 0)
69- y += (bottom - top - height) * ((adjustment_value - priv->adjustment->lower) /
70- (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size));
71+ if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) -
72+ gtk_adjustment_get_page_size (priv->adjustment) != 0)
73+ y += (bottom - top - height) * ((adjustment_value - gtk_adjustment_get_lower (priv->adjustment)) /
74+ (gtk_adjustment_get_upper (priv->adjustment) -
75+ gtk_adjustment_get_lower (priv->adjustment) -
76+ gtk_adjustment_get_page_size (priv->adjustment)));
77
78 y = CLAMP (y, top, bottom);
79
80@@ -233,9 +244,12 @@
81
82 x = left;
83
84- if (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size != 0)
85- x += (right - left - width) * ((adjustment_value - priv->adjustment->lower) /
86- (priv->adjustment->upper - priv->adjustment->lower - priv->adjustment->page_size));
87+ if (gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_lower (priv->adjustment) -
88+ gtk_adjustment_get_page_size (priv->adjustment) != 0)
89+ x += (right - left - width) * ((adjustment_value - gtk_adjustment_get_lower (priv->adjustment)) /
90+ (gtk_adjustment_get_upper (priv->adjustment) -
91+ gtk_adjustment_get_lower (priv->adjustment) -
92+ gtk_adjustment_get_page_size (priv->adjustment)));
93
94 x = CLAMP (x, left, right);
95
96@@ -571,7 +585,8 @@
97 * hidden a pager that is meant to be hidden/shown.
98 * I don't want to see pagers reappearing because
99 * of a change in the adjustment of an invisible pager or viceversa. */
100- if ((adjustment->upper - adjustment->lower) > adjustment->page_size)
101+ if ((gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) >
102+ gtk_adjustment_get_page_size (adjustment))
103 {
104 priv->fullsize = FALSE;
105 if (priv->proximity != FALSE)
106@@ -588,8 +603,8 @@
107 }
108 }
109
110- calc_layout_pager (scrollbar, adjustment->value);
111- calc_layout_slider (scrollbar, adjustment->value);
112+ calc_layout_pager (scrollbar, gtk_adjustment_get_value (adjustment));
113+ calc_layout_slider (scrollbar, gtk_adjustment_get_value (adjustment));
114
115 if (!priv->motion_notify_event && !priv->enter_notify_event)
116 gtk_widget_hide (GTK_WIDGET (priv->thumb));
117@@ -607,8 +622,8 @@
118 scrollbar = OS_SCROLLBAR (user_data);
119 priv = scrollbar->priv;
120
121- calc_layout_pager (scrollbar, adjustment->value);
122- calc_layout_slider (scrollbar, adjustment->value);
123+ calc_layout_pager (scrollbar, gtk_adjustment_get_value (adjustment));
124+ calc_layout_slider (scrollbar, gtk_adjustment_get_value (adjustment));
125
126 if (!priv->motion_notify_event && !priv->enter_notify_event)
127 gtk_widget_hide (GTK_WIDGET (priv->thumb));
128@@ -1134,11 +1149,12 @@
129 frac = (MAX (0, coord - trough_start) /
130 (gdouble) (trough_length - slider_length));
131
132- value = priv->adjustment->lower + frac * (priv->adjustment->upper -
133- priv->adjustment->lower -
134- priv->adjustment->page_size);
135+ value = gtk_adjustment_get_lower (priv->adjustment) + frac * (gtk_adjustment_get_upper (priv->adjustment) -
136+ gtk_adjustment_get_lower (priv->adjustment) -
137+ gtk_adjustment_get_page_size (priv->adjustment));
138
139- value = CLAMP (value, priv->adjustment->lower, priv->adjustment->upper - priv->adjustment->page_size);
140+ value = CLAMP (value, gtk_adjustment_get_lower (priv->adjustment),
141+ gtk_adjustment_get_upper (priv->adjustment) - gtk_adjustment_get_page_size (priv->adjustment));
142
143 return value;
144 }
145@@ -1215,7 +1231,7 @@
146 priv->win_y + priv->overlay.y,
147 priv->win_y + priv->overlay.y + priv->overlay.height - priv->slider.height);
148
149- if (priv->adjustment->value == 0)
150+ if (gtk_adjustment_get_value (priv->adjustment) == 0)
151 {
152 priv->slide_initial_slider_position = 0;
153 priv->slide_initial_coordinate = MAX (event->y_root, priv->win_y + priv->pointer_y);
154@@ -1241,7 +1257,7 @@
155 priv->win_x + priv->overlay.x + priv->overlay.width - priv->slider.width);
156 y = priv->win_y;
157
158- if (priv->adjustment->value == 0)
159+ if (gtk_adjustment_get_value (priv->adjustment) == 0)
160 {
161 priv->slide_initial_slider_position = 0;
162 priv->slide_initial_coordinate = MAX (event->x_root, priv->win_x + priv->pointer_x);
163@@ -1275,7 +1291,7 @@
164
165 priv = scrollbar->priv;
166
167- delta = pow (priv->adjustment->page_size, 2.0 / 3.0);
168+ delta = pow (gtk_adjustment_get_page_size (priv->adjustment), 2.0 / 3.0);
169
170 if (direction == GDK_SCROLL_UP ||
171 direction == GDK_SCROLL_LEFT)
172@@ -1301,10 +1317,10 @@
173 delta = get_wheel_delta (scrollbar, event->direction);
174
175 gtk_adjustment_set_value (priv->adjustment,
176- CLAMP (priv->adjustment->value + delta,
177- priv->adjustment->lower,
178- (priv->adjustment->upper -
179- priv->adjustment->page_size)));
180+ CLAMP (gtk_adjustment_get_value (priv->adjustment) + delta,
181+ gtk_adjustment_get_lower (priv->adjustment),
182+ (gtk_adjustment_get_upper (priv->adjustment) -
183+ gtk_adjustment_get_page_size (priv->adjustment))));
184
185 return FALSE;
186 }
187@@ -1410,8 +1426,8 @@
188
189 priv->lock_position = FALSE;
190
191- calc_layout_pager (scrollbar, priv->adjustment->value);
192- calc_layout_slider (scrollbar, priv->adjustment->value);
193+ calc_layout_pager (scrollbar, gtk_adjustment_get_value (priv->adjustment));
194+ calc_layout_slider (scrollbar, gtk_adjustment_get_value (priv->adjustment));
195
196 store_toplevel_position (scrollbar);
197
198@@ -1900,7 +1916,7 @@
199 g_signal_connect (G_OBJECT (gtk_widget_get_toplevel (widget)), "configure-event",
200 G_CALLBACK (toplevel_configure_event_cb), scrollbar);
201
202- calc_layout_pager (scrollbar, priv->adjustment->value);
203+ calc_layout_pager (scrollbar, gtk_adjustment_get_value (priv->adjustment));
204
205 os_pager_set_parent (OS_PAGER (priv->pager), widget);
206
207@@ -1963,8 +1979,8 @@
208
209 if (priv->adjustment != NULL)
210 {
211- calc_layout_pager (scrollbar, priv->adjustment->value);
212- calc_layout_slider (scrollbar, priv->adjustment->value);
213+ calc_layout_pager (scrollbar, gtk_adjustment_get_value (priv->adjustment));
214+ calc_layout_slider (scrollbar, gtk_adjustment_get_value (priv->adjustment));
215 }
216
217 os_pager_size_allocate (OS_PAGER (priv->pager), rect);
218@@ -1974,7 +1990,7 @@
219 if (gtk_widget_get_realized (widget))
220 store_toplevel_position (scrollbar);
221
222- widget->allocation = *allocation;
223+ gtk_widget_set_allocation (widget, allocation);
224 }
225
226 static void
227
228=== modified file 'os/os-thumb.c'
229--- os/os-thumb.c 2011-05-18 18:25:13 +0000
230+++ os/os-thumb.c 2011-05-19 14:54:29 +0000
231@@ -273,12 +273,19 @@
232 if (gdk_screen_is_composited (gtk_widget_get_screen (widget)))
233 {
234 GdkVisual *visual;
235+ guint32 red_mask;
236+ guint32 green_mask;
237+ guint32 blue_mask;
238
239 visual = gtk_widget_get_visual (widget);
240
241- if (visual->depth == 32 && (visual->red_mask == 0xff0000 &&
242- visual->green_mask == 0x00ff00 &&
243- visual->blue_mask == 0x0000ff))
244+ gdk_visual_get_red_pixel_details (visual, &red_mask, NULL, NULL);
245+ gdk_visual_get_green_pixel_details (visual, &green_mask, NULL, NULL);
246+ gdk_visual_get_blue_pixel_details (visual, &blue_mask, NULL, NULL);
247+
248+ if (gdk_visual_get_depth (visual) == 32 && (red_mask == 0xff0000 &&
249+ green_mask == 0x00ff00 &&
250+ blue_mask == 0x0000ff))
251 priv->can_rgba = TRUE;
252 }
253
254
255=== modified file 'os/os-utils.h'
256--- os/os-utils.h 2011-03-23 15:42:09 +0000
257+++ os/os-utils.h 2011-05-19 14:54:29 +0000
258@@ -28,8 +28,7 @@
259 #define __OS_UTILS_H__
260
261 #include <glib.h>
262-#include <gtk/gtkwidget.h>
263-#include <gtk/gtkenums.h>
264+#include <gtk/gtk.h>
265
266 G_BEGIN_DECLS
267

Subscribers

People subscribed via source and target branches