comparison: pidgin/gtkwebview.c
pidgin/gtkwebview.c
- branch
- cpw.qulogic.gtk3-required
- changeset 33127
- 02a3db370988
- parent 32797
- 3fe407409ec2
- parent 33123
- 1e48e3fa4b5c
- child 33128
- 88ee8f3bfff3
equal
deleted
inserted
replaced
| 32798:8b3b9ddcd0bd | 33127:02a3db370988 |
|---|---|
| 233 gdouble scroll_val; | 233 gdouble scroll_val; |
| 234 | 234 |
| 235 g_return_val_if_fail(priv->scroll_time != NULL, FALSE); | 235 g_return_val_if_fail(priv->scroll_time != NULL, FALSE); |
| 236 | 236 |
| 237 adj = priv->vadj; | 237 adj = priv->vadj; |
| 238 #if GTK_CHECK_VERSION(2,14,0) | |
| 239 max_val = gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj); | 238 max_val = gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj); |
| 240 #else | |
| 241 max_val = adj->upper - adj->page_size; | |
| 242 #endif | |
| 243 scroll_val = gtk_adjustment_get_value(adj) + | 239 scroll_val = gtk_adjustment_get_value(adj) + |
| 244 ((max_val - gtk_adjustment_get_value(adj)) / 3); | 240 ((max_val - gtk_adjustment_get_value(adj)) / 3); |
| 245 | 241 |
| 246 if (g_timer_elapsed(priv->scroll_time, NULL) > MAX_SCROLL_TIME | 242 if (g_timer_elapsed(priv->scroll_time, NULL) > MAX_SCROLL_TIME |
| 247 || scroll_val >= max_val) { | 243 || scroll_val >= max_val) { |
| 265 GtkWebViewPriv *priv = data; | 261 GtkWebViewPriv *priv = data; |
| 266 GtkAdjustment *adj = priv->vadj; | 262 GtkAdjustment *adj = priv->vadj; |
| 267 gdouble max_val; | 263 gdouble max_val; |
| 268 | 264 |
| 269 if (adj) { | 265 if (adj) { |
| 270 #if GTK_CHECK_VERSION(2,14,0) | |
| 271 max_val = gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj); | 266 max_val = gtk_adjustment_get_upper(adj) - gtk_adjustment_get_page_size(adj); |
| 272 #else | |
| 273 max_val = adj->upper - adj->page_size; | |
| 274 #endif | |
| 275 gtk_adjustment_set_value(adj, max_val); | 267 gtk_adjustment_set_value(adj, max_val); |
| 276 } | 268 } |
| 277 | 269 |
| 278 priv->scroll_src = 0; | 270 priv->scroll_src = 0; |
| 279 return FALSE; | 271 return FALSE; |
