diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2011-07-19 11:02:26 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2011-07-19 11:02:26 +0000 |
| commit | 4a06b078b6d39618c304e444adcda5cdd9c6ba9d (patch) | |
| tree | 26f595a777dfd20b87bff7ff4bb943482c5b1f6e | |
| parent | f282154ab0134ac71a55c05560a96c02c079158b (diff) | |
Fix some errors when compiling with -DGSEAL_ENABLE.
svn path=/trunk/; revision=38108
| -rw-r--r-- | gtk/rtp_player.c | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/gtk/rtp_player.c b/gtk/rtp_player.c index 9511eb117b..f97716ece9 100644 --- a/gtk/rtp_player.c +++ b/gtk/rtp_player.c @@ -1016,6 +1016,26 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index) } } #endif +#if GTK_CHECK_VERSION(2,14,0) + if (!rci->cursor_catch) { + if (idx/MULT < gtk_adjustment_get_page_size(rci->h_scrollbar_adjustment)/2) { + gtk_adjustment_set_value(rci->h_scrollbar_adjustment, gtk_adjustment_get_lower(rci->h_scrollbar_adjustment)); + } else if (idx/MULT > (gtk_adjustment_get_upper(rci->h_scrollbar_adjustment) - gtk_adjustment_get_page_size(rci->h_scrollbar_adjustment)/2)) { + gtk_adjustment_set_value(rci->h_scrollbar_adjustment, gtk_adjustment_get_upper(rci->h_scrollbar_adjustment) - gtk_adjustment_get_page_size(rci->h_scrollbar_adjustment)); + } else { + gtk_adjustment_set_value(rci->h_scrollbar_adjustment, idx/MULT - gtk_adjustment_get_page_size(rci->h_scrollbar_adjustment)/2); + } + + gtk_adjustment_value_changed(rci->h_scrollbar_adjustment); + } else if ( (rci->cursor_prev/MULT < gtk_adjustment_get_value(rci->h_scrollbar_adjustment)+gtk_adjustment_get_page_increment(rci->h_scrollbar_adjustment)) && + (idx/MULT >= gtk_adjustment_get_value(rci->h_scrollbar_adjustment) + +gtk_adjustment_get_page_increment(rci->h_scrollbar_adjustment)) ){ + rci->cursor_catch = FALSE; + for (i=1; i<10; i++) { + gtk_adjustment_set_value(rci->h_scrollbar_adjustment, MIN(gtk_adjustment_get_upper(rci->h_scrollbar_adjustment)-gtk_adjustment_get_page_size(rci->h_scrollbar_adjustment), gtk_adjustment_get_value(rci->h_scrollbar_adjustment) + -gtk_adjustment_get_page_size(rci->h_scrollbar_adjustment)/20)); + gtk_adjustment_value_changed(rci->h_scrollbar_adjustment); + } + } +#else if (!rci->cursor_catch) { if (idx/MULT < rci->h_scrollbar_adjustment->page_size/2) { rci->h_scrollbar_adjustment->value = rci->h_scrollbar_adjustment->lower; @@ -1033,8 +1053,8 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index) rci->h_scrollbar_adjustment->value = MIN(rci->h_scrollbar_adjustment->upper-rci->h_scrollbar_adjustment->page_size, rci->h_scrollbar_adjustment->value + (rci->h_scrollbar_adjustment->page_size/20)); gtk_adjustment_value_changed(rci->h_scrollbar_adjustment); } - } +#endif /* Connect back the "value" scroll signal */ |