callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crashes in connection with pathbar scrolling (#321560, Bogdan Nicula)

Browse Source 
2005-11-18  Matthias Clasen  <mclasen@redhat.com>

	Fix crashes in connection with pathbar scrolling (#321560,
	Bogdan Nicula)

	* gtk/gtkpathbar.c (gtk_path_bar_update_slider_buttons):
	Stop scrolling when desensitising slider buttons.
	(gtk_path_bar_scroll_timeout, gtk_path_bar_slider_button_press):
	And use it here.

	* gtk/gtkpathbar.h (struct _GtkPathBar): Add a separate
	scrolling_down flag.
This commit is contained in:
Matthias Clasen 2005-11-19 03:46:04 +00:00 committed by Matthias Clasen
parent 478043a1ed
commit 6e4a379e93
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2005-11-18 Matthias Clasen <mclasen@redhat.com>
Fix crashes in connection with pathbar scrolling (#321560,
Bogdan Nicula)
* gtk/gtkpathbar.c (gtk_path_bar_update_slider_buttons):
Stop scrolling when desensitising slider buttons.
(gtk_path_bar_scroll_timeout, gtk_path_bar_slider_button_press):
And use it here.
* gtk/gtkpathbar.h (struct _GtkPathBar): Add a separate
scrolling_down flag.
2005-11-18 Matthias Clasen <mclasen@redhat.com> 2005-11-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkpathbar.c (button_clicked_cb): Fix a C99ism. * gtk/gtkpathbar.c (button_clicked_cb): Fix a C99ism.

13
ChangeLog.pre-2-10
View File

@ -1,3 +1,16 @@
2005-11-18 Matthias Clasen <mclasen@redhat.com>
Fix crashes in connection with pathbar scrolling (#321560,
Bogdan Nicula)
* gtk/gtkpathbar.c (gtk_path_bar_update_slider_buttons):
Stop scrolling when desensitising slider buttons.
(gtk_path_bar_scroll_timeout, gtk_path_bar_slider_button_press):
And use it here.
* gtk/gtkpathbar.h (struct _GtkPathBar): Add a separate
scrolling_down flag.
2005-11-18 Matthias Clasen <mclasen@redhat.com> 2005-11-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkpathbar.c (button_clicked_cb): Fix a C99ism. * gtk/gtkpathbar.c (button_clicked_cb): Fix a C99ism.

4
gtk/gtkpathbar.c
View File

@ -734,7 +734,7 @@ gtk_path_bar_scroll_timeout (GtkPathBar *path_bar)
{ {
if (path_bar->scrolling_up) if (path_bar->scrolling_up)
gtk_path_bar_scroll_up (path_bar->up_slider_button, path_bar); gtk_path_bar_scroll_up (path_bar->up_slider_button, path_bar);
else else if (path_bar->scrolling_down)
gtk_path_bar_scroll_down (path_bar->down_slider_button, path_bar); gtk_path_bar_scroll_down (path_bar->down_slider_button, path_bar);
if (path_bar->need_timer) if (path_bar->need_timer)
@ -779,12 +779,14 @@ gtk_path_bar_slider_button_press (GtkWidget *widget,
if (widget == path_bar->up_slider_button) if (widget == path_bar->up_slider_button)
{ {
path_bar->scrolling_down = FALSE;
path_bar->scrolling_up = TRUE; path_bar->scrolling_up = TRUE;
gtk_path_bar_scroll_up (path_bar->up_slider_button, path_bar); gtk_path_bar_scroll_up (path_bar->up_slider_button, path_bar);
} }
else if (widget == path_bar->down_slider_button) else if (widget == path_bar->down_slider_button)
{ {
path_bar->scrolling_up = FALSE; path_bar->scrolling_up = FALSE;
path_bar->scrolling_down = TRUE;
gtk_path_bar_scroll_down (path_bar->down_slider_button, path_bar); gtk_path_bar_scroll_down (path_bar->down_slider_button, path_bar);
} }

7
gtk/gtkpathbar.h
View File

@ -61,9 +61,10 @@ struct _GtkPathBar
gint16 button_offset; gint16 button_offset;
guint timer; guint timer;
guint slider_visible : 1; guint slider_visible : 1;
guint need_timer : 1; guint need_timer : 1;
guint ignore_click : 1; guint ignore_click : 1;
guint scrolling_up : 1; guint scrolling_up : 1;
guint scrolling_down : 1;
}; };
struct _GtkPathBarClass struct _GtkPathBarClass