osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Get rid of all GtkAdjustment element accesses. Fix a bug 

introduced when fixing this stuff for rtp_player.c

svn path=/trunk/; revision=38111
This commit is contained in:
Jörg Mayer 2011-07-19 14:33:50 +00:00
parent 7bc1f25843
commit 9166443e3c
4 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/iax2_analysis.c
View File

@ -1283,6 +1283,17 @@ static void dialog_graph_draw(user_data_t* user_data)
/* update the scrollbar */
#if GTK_CHECK_VERSION(2,14,0)
gtk_adjustment_set_upper(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) user_data->dlg.dialog_graph.max_interval);
gtk_adjustment_set_step_increment(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) ((last_interval-first_interval)/10));
gtk_adjustment_set_page_increment(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (last_interval-first_interval));
if((last_interval-first_interval)*100 < user_data->dlg.dialog_graph.max_interval){
gtk_adjustment_set_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (user_data->dlg.dialog_graph.max_interval/100));
} else {
gtk_adjustment_set_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (last_interval-first_interval));
}
gtk_adjustment_set_value(user_data->dlg.dialog_graph.scrollbar_adjustment, last_interval - gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment));
#else
user_data->dlg.dialog_graph.scrollbar_adjustment->upper=(gfloat) user_data->dlg.dialog_graph.max_interval;
user_data->dlg.dialog_graph.scrollbar_adjustment->step_increment=(gfloat) ((last_interval-first_interval)/10);
user_data->dlg.dialog_graph.scrollbar_adjustment->page_increment=(gfloat) (last_interval-first_interval);
@ -1292,6 +1303,7 @@ static void dialog_graph_draw(user_data_t* user_data)
user_data->dlg.dialog_graph.scrollbar_adjustment->page_size=(gfloat) (last_interval-first_interval);
}
user_data->dlg.dialog_graph.scrollbar_adjustment->value=last_interval-user_data->dlg.dialog_graph.scrollbar_adjustment->page_size;
#endif
gtk_adjustment_changed(user_data->dlg.dialog_graph.scrollbar_adjustment);
gtk_adjustment_value_changed(user_data->dlg.dialog_graph.scrollbar_adjustment);
@ -1373,7 +1385,11 @@ static void scrollbar_changed(GtkWidget *widget _U_, gpointer data)
user_data_t *user_data = data;
guint32 mi;
#if GTK_CHECK_VERSION(2,14,0)
mi=(guint32) (gtk_adjustment_get_value(user_data->dlg.dialog_graph.scrollbar_adjustment) + gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment));
#else
mi=(guint32) (user_data->dlg.dialog_graph.scrollbar_adjustment->value+user_data->dlg.dialog_graph.scrollbar_adjustment->page_size);
#endif
if(user_data->dlg.dialog_graph.last_interval==mi){
return;
}

18
gtk/io_stat.c
View File

@ -1128,6 +1128,19 @@ io_stat_draw(io_stat_t *io)
/* update the scrollbar */
#if GTK_CHECK_VERSION(2,14,0)
if (io->max_interval == 0) {
gtk_adjustment_set_upper(io->scrollbar_adjustment, (gfloat) io->interval);
gtk_adjustment_set_step_increment(io->scrollbar_adjustment, (gfloat) (io->interval/10));
gtk_adjustment_set_page_increment(io->scrollbar_adjustment, (gfloat) io->interval);
} else {
gtk_adjustment_set_upper(io->scrollbar_adjustment, (gfloat) io->max_interval);
gtk_adjustment_set_step_increment(io->scrollbar_adjustment, (gfloat) ((last_interval-first_interval)/10));
gtk_adjustment_set_page_increment(io->scrollbar_adjustment, (gfloat) (last_interval-first_interval));
}
gtk_adjustment_set_page_size(io->scrollbar_adjustment, gtk_adjustment_get_page_increment(io->scrollbar_adjustment));
gtk_adjustment_set_value(io->scrollbar_adjustment, (gfloat)first_interval);
#else
if (io->max_interval == 0) {
io->scrollbar_adjustment->upper=(gfloat) io->interval;
io->scrollbar_adjustment->step_increment=(gfloat) (io->interval/10);
@ -1139,6 +1152,7 @@ io_stat_draw(io_stat_t *io)
}
io->scrollbar_adjustment->page_size=io->scrollbar_adjustment->page_increment;
io->scrollbar_adjustment->value=(gfloat)first_interval;
#endif
gtk_adjustment_changed(io->scrollbar_adjustment);
gtk_adjustment_value_changed(io->scrollbar_adjustment);
@ -1418,7 +1432,11 @@ scrollbar_changed(GtkWidget *widget _U_, gpointer user_data)
io_stat_t *io = user_data;
guint32 mi;
#if GTK_CHECK_VERSION(2,14,0)
mi=(guint32) (gtk_adjustment_get_value(io->scrollbar_adjustment) + gtk_adjustment_get_page_size(io->scrollbar_adjustment));
#else
mi=(guint32) (io->scrollbar_adjustment->value+io->scrollbar_adjustment->page_size);
#endif
if(io->last_interval==mi){
return;
}

16
gtk/rtp_analysis.c
View File

@ -1284,6 +1284,17 @@ static void dialog_graph_draw(user_data_t* user_data)
/* update the scrollbar */
#if GTK_CHECK_VERSION(2,18,0)
gtk_adjustment_set_upper(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) user_data->dlg.dialog_graph.max_interval);
gtk_adjustment_set_step_increment(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) ((last_interval-first_interval)/10));
gtk_adjustment_set_page_increment(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (last_interval-first_interval));
if((last_interval-first_interval)*100 < user_data->dlg.dialog_graph.max_interval){
gtk_adjustment_set_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (user_data->dlg.dialog_graph.max_interval/100));
} else {
gtk_adjustment_set_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment, (gfloat) (last_interval-first_interval));
}
gtk_adjustment_set_value(user_data->dlg.dialog_graph.scrollbar_adjustment, last_interval - gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment));
#else
user_data->dlg.dialog_graph.scrollbar_adjustment->upper=(gfloat) user_data->dlg.dialog_graph.max_interval;
user_data->dlg.dialog_graph.scrollbar_adjustment->step_increment=(gfloat) ((last_interval-first_interval)/10);
user_data->dlg.dialog_graph.scrollbar_adjustment->page_increment=(gfloat) (last_interval-first_interval);
@ -1293,6 +1304,7 @@ static void dialog_graph_draw(user_data_t* user_data)
user_data->dlg.dialog_graph.scrollbar_adjustment->page_size=(gfloat) (last_interval-first_interval);
}
user_data->dlg.dialog_graph.scrollbar_adjustment->value=last_interval-user_data->dlg.dialog_graph.scrollbar_adjustment->page_size;
#endif
gtk_adjustment_changed(user_data->dlg.dialog_graph.scrollbar_adjustment);
gtk_adjustment_value_changed(user_data->dlg.dialog_graph.scrollbar_adjustment);
@ -1388,7 +1400,11 @@ static gint scrollbar_changed(GtkWidget *widget _U_, gpointer data)
user_data_t *user_data=(user_data_t *)data;
guint32 mi;
#if GTK_CHECK_VERSION(2,14,0)
mi=(guint32) (gtk_adjustment_get_value(user_data->dlg.dialog_graph.scrollbar_adjustment) + gtk_adjustment_get_page_size(user_data->dlg.dialog_graph.scrollbar_adjustment));
#else
mi=(guint32) (user_data->dlg.dialog_graph.scrollbar_adjustment->value+user_data->dlg.dialog_graph.scrollbar_adjustment->page_size);
#endif
if(user_data->dlg.dialog_graph.last_interval==mi){
return TRUE;
}

4
gtk/rtp_player.c
View File

@ -1028,10 +1028,10 @@ draw_channel_cursor(rtp_channel_info_t *rci, guint32 start_index)
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)) ){
(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_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);
}
}