From 7ec992f6da586eaec5be329260e9f55afa4520a4 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Fri, 18 Feb 2005 10:17:54 +0000 Subject: [PATCH] 2005-02-18 [colin] 1.0.1cvs11.6 * src/folderview.c Fix scrolldown (bug 662) --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/folderview.c | 8 ++++---- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index 75a1903e3..b37328daf 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -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 diff --git a/PATCHSETS b/PATCHSETS index 70b680271..ad6156eb8 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -387,3 +387,4 @@ ( 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 diff --git a/configure.ac b/configure.ac index 860711f18..1a6f669c3 100644 --- a/configure.ac +++ b/configure.ac @@ -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} diff --git a/src/folderview.c b/src/folderview.c index 194144caa..1ae1697d1 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -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); -- 2.25.1