[Patch 2088597]: Stop scrollbars from getting too small at the end.

2 files changed, 13 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b3fa84..53c6407 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2009-10-07  Donal K. Fellows  <dkf@users.sf.net>
+
+	* unix/tkUnixScrlbr.c (TkpComputeScrollbarGeometry): [Patch 2088597]:
+	Stop scrollbars from getting too small at the end.
+
 2009-09-14  Jeff Hobbs  <jeffh@ActiveState.com>
 
-	* generic/tkMenuDraw.c (TkPostSubmenu): Fix reposting of submenu in
-	* win/tkWinMenu.c (TkWinHandleMenuEvent): torn off Windows menu.
-	[Bug 873613]
-	(DrawMenuEntryArrow): Draw Win menu arrow after being torn
-	off. [Bug 873608]
+	* generic/tkMenuDraw.c (TkPostSubmenu): [Bug 873613]: Fix reposting of
+	* win/tkWinMenu.c (TkWinHandleMenuEvent): submenu in torn off Windows
+	menu.
+	(DrawMenuEntryArrow): [Bug 873608]: Draw Win menu arrow after being
+	torn off.
 
 2009-08-24  Daniel Steffen  <das@users.sourceforge.net>
 
diff --git a/unix/tkUnixScrlbr.c b/unix/tkUnixScrlbr.c
index fc3e7f8..e4ad751 100644
--- a/unix/tkUnixScrlbr.c
+++ b/unix/tkUnixScrlbr.c
@@ -9,7 +9,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnixScrlbr.c,v 1.3 2000/11/22 01:49:38 ericm Exp $
+ * RCS: @(#) $Id: tkUnixScrlbr.c,v 1.3.6.1 2009/10/07 14:28:37 dkf Exp $
  */
 
 #include "tkScrollbar.h"
@@ -302,8 +302,8 @@ TkpComputeScrollbarGeometry(scrollPtr)
      * a minimal width (so it can be grabbed with the mouse).
      */
 
-    if (scrollPtr->sliderFirst > (fieldLength - 2*scrollPtr->borderWidth)) {
-	scrollPtr->sliderFirst = fieldLength - 2*scrollPtr->borderWidth;
+    if (scrollPtr->sliderFirst > (fieldLength - MIN_SLIDER_LENGTH)) {
+	scrollPtr->sliderFirst = fieldLength - MIN_SLIDER_LENGTH;
     }
     if (scrollPtr->sliderFirst < 0) {
 	scrollPtr->sliderFirst = 0;