2005-02-18 [colin] 1.0.1cvs11.6
authorColin Leroy <colin@colino.net>
Fri, 18 Feb 2005 10:17:54 +0000 (10:17 +0000)
committerColin Leroy <colin@colino.net>
Fri, 18 Feb 2005 10:17:54 +0000 (10:17 +0000)
* src/folderview.c
Fix scrolldown (bug 662)

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/folderview.c

index 75a1903e3d4832fe73cbf1b713f3cead2389911d..b37328dafeae25aa085d8606511e0a40e397a3bf 100644 (file)
@@ -1,3 +1,8 @@
+2005-02-18 [colin]     1.0.1cvs11.6
+
+       * src/folderview.c
+               Fix scrolldown (bug 662)
+
 2005-02-17 [colin]     1.0.1cvs11.5
 
        * src/codeconv.c
index 70b6802714e879fbf7427e78d1a6efb3cc3a8275..ad6156eb8edddae0849714e89309262a19dfc9bc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.395.2.52 -r 1.395.2.53 src/summaryview.c; cvs diff -u -r 1.3.2.17 -r 1.3.2.18 src/prefs_themes.c; ) > 1.0.1cvs11.3.patchset
 ( cvs diff -u -r 1.382.2.102 -r 1.382.2.103 src/compose.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/exportldif.c; cvs diff -u -r 1.25.2.7 -r 1.25.2.8 src/matcher_parser_parse.y; cvs diff -u -r 1.49.2.34 -r 1.49.2.35 src/procmime.c; cvs diff -u -r 1.9.2.11 -r 1.9.2.12 src/sourcewindow.c; cvs diff -u -r 1.24.2.5 -r 1.24.2.6 src/common/Makefile.am; cvs diff -u -r -1.1.4.2 -r -1.1.4.3 src/common/intl.h; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c; ) > 1.0.1cvs11.4.patchset
 ( cvs diff -u -r 1.65.2.23 -r 1.65.2.24 src/codeconv.c; cvs diff -u -r 1.83.2.31 -r 1.83.2.32 src/mimeview.c; ) > 1.0.1cvs11.5.patchset
+( cvs diff -u -r 1.207.2.30 -r 1.207.2.31 src/folderview.c; ) > 1.0.1cvs11.6.patchset
index 860711f1896e0ff2ef6279f5dee75332e53f875f..1a6f669c3ec9121cd478e6971ab751e87df1e1bb 100644 (file)
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=11
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.5
+EXTRA_GTK2_VERSION=.6
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
index 194144caa0fab1e0f64d56cc8bac99ceea107739..1ae1697d15d0bd306813b9bc61200ccad558da1c 100644 (file)
@@ -2097,11 +2097,11 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
        FolderItem *item, *src_item = NULL;
        GtkCTreeNode *node = NULL;
        gboolean acceptable = FALSE;
-       gint height = folderview->ctree->allocation.height;
-       gint total_height = folderview->ctree->requisition.height;
        GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
                                GTK_SCROLLED_WINDOW(folderview->scrolledwin));
-       gfloat vpos = pos->value;
+       int height = (int)pos->page_size;
+       int total_height = (int)pos->upper;
+       int vpos = (int) pos->value;
 
        if (gtk_clist_get_selection_info
                (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
@@ -2110,7 +2110,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                if (y > height - 24 && height + vpos < total_height)
                        gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
 
-               if (y < 24 && y > 0)
+               if (y < 48 && y > 0)
                        gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
 
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);