debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add missing assignments to fix drag scrolling with KatzeScrolled

Browse source
This commit is contained in:
Christian Dywan 2010-01-30 23:34:04 +01:00
parent cc50c6d58b
commit 01daddf34c
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
katze/katze-scrolled.c
View file

@ -23,8 +23,6 @@
#define gtk_adjustment_get_upper(adj) adj->upper #define gtk_adjustment_get_upper(adj) adj->upper
#define gtk_adjustment_get_lower(adj) adj->lower #define gtk_adjustment_get_lower(adj) adj->lower
#define gtk_adjustment_get_value(adj) adj->value #define gtk_adjustment_get_value(adj) adj->value
#define gtk_adjustment_get_page_size(adj) adj->page_size
#define gtk_adjustment_get_page_size(adj) adj->page_size
#endif #endif
#define DEFAULT_INTERVAL 50 #define DEFAULT_INTERVAL 50
@ -331,8 +329,8 @@ adjust_scrollbar (KatzeScrolled* scrolled,
return FALSE; return FALSE;
} }
size = ((double)page_size) / (upper - lower) * (horizontal size = page_size / (upper - lower)
? widget->allocation.height : widget->allocation.width); * (horizontal ? widget->allocation.height : widget->allocation.width);
if (size != *previous_size) if (size != *previous_size)
{ {
*previous_size = size; *previous_size = size;
@ -580,11 +578,15 @@ do_motion_scroll (KatzeScrolled* scrolled,
} }
hadjustment = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled)); hadjustment = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (scrolled));
hpage_size = gtk_adjustment_get_page_size (hadjustment);
hupper = gtk_adjustment_get_upper (hadjustment);
hvalue = gtk_adjustment_get_value (hadjustment); hvalue = gtk_adjustment_get_value (hadjustment);
new_hvalue = calculate_motion_scroll_values (hvalue, new_hvalue = calculate_motion_scroll_values (hvalue,
hupper - hpage_size, x, priv->previous_x); hupper - hpage_size, x, priv->previous_x);
vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled)); vadjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled));
vpage_size = gtk_adjustment_get_page_size (vadjustment);
vupper = gtk_adjustment_get_upper (vadjustment);
vvalue = gtk_adjustment_get_value (vadjustment); vvalue = gtk_adjustment_get_value (vadjustment);
new_vvalue = calculate_motion_scroll_values (vvalue, new_vvalue = calculate_motion_scroll_values (vvalue,
vupper - vpage_size, y, priv->previous_y); vupper - vpage_size, y, priv->previous_y);