From f3b275a39528e851375932c49160e22acc6135c4 Mon Sep 17 00:00:00 2001 From: dkf Date: Wed, 7 Oct 2009 14:31:02 +0000 Subject: [Patch 2088597]: Stop scrollbars from getting too small at the end. --- ChangeLog | 9 +++++++-- unix/tkUnixScrlbr.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0135e0..757a9d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,16 @@ +2009-10-07 Donal K. Fellows + + * unix/tkUnixScrlbr.c (TkpComputeScrollbarGeometry): [Patch 2088597]: + Stop scrollbars from getting too small at the end. + 2009-10-05 Don Porter * changes: Updated for 8.5.8 release. 2009-10-05 Pat Thoyts - * win/tkWinButton.c: Backported patch avoiding 3D effects with - user-specified background [Bug 2860827] + * win/tkWinButton.c: [Bug 2860827]: Backported patch avoiding 3D + effects with user-specified background. 2009-09-25 Donal K. Fellows diff --git a/unix/tkUnixScrlbr.c b/unix/tkUnixScrlbr.c index beef224..a23bba1 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.6 2007/12/13 15:28:51 dgp Exp $ + * RCS: @(#) $Id: tkUnixScrlbr.c,v 1.6.2.1 2009/10/07 14:31:02 dkf Exp $ */ #include "tkInt.h" @@ -303,8 +303,8 @@ TkpComputeScrollbarGeometry( * 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; -- cgit v0.12