Changeset 373 for trunk/src/helpers/winh.c

Timestamp:

Nov 16, 2008, 11:36:11 PM (17 years ago)

Author:

pr

Message:

Fix scroll bar bugs in textview control. Bug 1086.

File:

• trunk/src/helpers/winh.c (modified) (10 diffs)

trunk/src/helpers/winh.c

@@ -19 +19 @@
 
 /*
- *      Copyright (C) 1997-2006 Ulrich M”ller.
+ *      Copyright (C) 1997-2008 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -1935 +1935 @@
  *          the workarea minus one.
  *
+ *          [pr]: I disagree with the above "workarea minus one" stuff.
+ *                It is perfectly possible to have the workarea and the
+ *                window area the same size and to display all the content.
+ *                This also means you do NOT get a disabled scroll bar
+ *                any more when they are the same size.
+ *
  *          For horizontal scroll bars, this is the X coordinate,
  *          counting from the left of the window (0 means leftmost).
@@ -1970 +1976 @@
  *@@changed V1.0.1 (2003-01-25) [umoeller]: fixed max value which caused right/bottommost scroll button to never be disabled
  *@@changed V1.0.1 (2003-01-25) [umoeller]: fixed bad thumb position for large offsets
+ *@@changed WarpIN V1.0.18 (2008-11-16) [pr]: fix rounding errors @@fixes 1086
+ *@@changed WarpIN V1.0.18 (2008-11-16) [pr]: disable scroll bars when workarea = win area @@fixes 1086
  */
 
@@ -1987 +1995 @@
     BOOL brc = FALSE;
 
-    if (ulWorkareaPels >= ulWinPels)
+    if (ulWorkareaPels > ulWinPels) // WarpIN V1.0.18
     {
         // for large workareas, adjust scroll bar units
-        USHORT  usDivisor = 1;
+        USHORT  usDivisor = 1, usRounder;
         USHORT  lMaxAllowedUnitOfs;
 
@@ -1996 +2004 @@
             usDivisor = 100;
 
+        usRounder = usDivisor - 1;  // WarpIN V1.0.18
         // scrollbar needed:
 
@@ -2004 +2013 @@
 
         // calculate limit
-        lMaxAllowedUnitOfs =   (ulWorkareaPels - ulWinPels)
+        lMaxAllowedUnitOfs =   (ulWorkareaPels - ulWinPels + usRounder)
                              / usDivisor;
 
@@ -2010 +2019 @@
         WinSendMsg(hwndScrollBar,
                    SBM_SETSCROLLBAR,
-                   (MPARAM)(ulCurPelsOfs / usDivisor),   // position: 0 means top
+                   (MPARAM)((ulCurPelsOfs + usRounder) / usDivisor),   // position: 0 means top
                    MPFROM2SHORT(0,  // minimum
                                 lMaxAllowedUnitOfs));    // maximum
@@ -2018 +2027 @@
         WinSendMsg(hwndScrollBar,
                    SBM_SETTHUMBSIZE,
-                   MPFROM2SHORT(    ulWinPels / usDivisor,       // visible
-                                    ulWorkareaPels / usDivisor), // total
+                   MPFROM2SHORT(    (ulWinPels + usRounder) / usDivisor,       // visible
+                                    (ulWorkareaPels + usRounder) / usDivisor), // total
                    0);
         brc = TRUE;
@@ -2077 +2086 @@
  *@@changed V0.9.7 (2001-01-17) [umoeller]: changed PLONG to PULONG
  *@@changed V1.0.1 (2003-01-25) [umoeller]: changed prototype, no longer calling WinScrollWindow, fixed offset bugs
+ *@@changed WarpIN V1.0.18 (2008-11-16) [pr]: fix rounding error @@fixes 1086
  */
 
@@ -2147 +2157 @@
         WinSendMsg(hwndScrollBar,
                    SBM_SETPOS,
-                   (MPARAM)(*plCurPelsOfs / lScrollUnitPels),
+                   (MPARAM)((*plCurPelsOfs + (lScrollUnitPels / 2)) / lScrollUnitPels),  // WarpIN V1.0.18
                    0);