From fd8eb7674fdce0f78d84575ffaa855da197abe8c Mon Sep 17 00:00:00 2001 From: dkf Date: Wed, 7 Oct 2009 14:33:27 +0000 Subject: [Patch 2088597]: Stop scrollbars from getting too small at the end. --- ChangeLog | 17 +++++++++++------ unix/tkUnixScrlbr.c | 9 ++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd10b03..9e659af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,19 @@ +2009-10-07 Donal K. Fellows + + * unix/tkUnixScrlbr.c (TkpComputeScrollbarGeometry): [Patch 2088597]: + Stop scrollbars from getting too small at the end. + 2009-10-05 Pat Thoyts - * win/tkWinButton.c: [Bug 2860827] avoid 3D effects with - user-specified backgrounds. The default disabled text is embossed - on Windows. But this looks poor when a non-default background - color is in use. This patch disables the embossed effect for - buttons and labels when the background is non- standard. + * win/tkWinButton.c: [Bug 2860827]: Avoid 3D effects with + user-specified backgrounds. The default disabled text is embossed on + Windows. But this looks poor when a non-default background color is in + use. This patch disables the embossed effect for buttons and labels + when the background is non- standard. 2009-09-30 Pat Thoyts - * tests/winWm.test: [Bug 2799589] grab on deleted window. + * tests/winWm.test: [Bug 2799589]: Grab on deleted window. 2009-09-25 Donal K. Fellows diff --git a/unix/tkUnixScrlbr.c b/unix/tkUnixScrlbr.c index bf210e2..2ca0a2e 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.7 2008/12/09 23:21:48 dkf Exp $ + * RCS: @(#) $Id: tkUnixScrlbr.c,v 1.8 2009/10/07 14:33:27 dkf Exp $ */ #include "tkInt.h" @@ -305,14 +305,13 @@ 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; } - if (scrollPtr->sliderLast < (scrollPtr->sliderFirst - + MIN_SLIDER_LENGTH)) { + if (scrollPtr->sliderLast < scrollPtr->sliderFirst + MIN_SLIDER_LENGTH) { scrollPtr->sliderLast = scrollPtr->sliderFirst + MIN_SLIDER_LENGTH; } if (scrollPtr->sliderLast > fieldLength) { -- cgit v0.12