Changeset 374 for branches

Timestamp:

Nov 17, 2008, 12:17:05 AM (17 years ago)

Author:

pr

Message:

Fix scroll bar bugs in textview controls. Bug 1086.

Location:

branches/branch-1-0/src/helpers

Files:

• textview.c (modified) (13 diffs)
• winh.c (modified) (9 diffs)

branches/branch-1-0/src/helpers/textview.c

@@ -183 +183 @@
 
 /*
- *      Copyright (C) 2000 Ulrich M”ller.
+ *      Copyright (C) 2000-2008 Ulrich M”ller.
  *      This program is part of the XWorkplace package.
  *      This program is free software; you can redistribute it and/or modify
@@ -1100 +1100 @@
  *
  *@@changed V0.9.3 (2000-05-06) [umoeller]: largely rewritten; now handling paragraph and character formats
+ *@@changed V1.0.18 (2008-11-16) [pr]: bodge formatting to remove unwanted scroll bars @@fixes 1086
  *@@todo TXVWORDF_GLUEWITHNEXT
  */
@@ -1310 +1311 @@
                             {
                                 // yes: check if the word still fits
-                                if (    (flbuf.lXCurrent + pWordThis->ulCXWithSpaces // ###
+                                // WarpIN V1.0.18 @@todo add fudge factor of 2 - makes things work
+                                if (    (flbuf.lXCurrent + pWordThis->ulCXWithSpaces + 2
                                              > prclView->xRight)
                                              // > ulWinCX)
@@ -1955 +1957 @@
  *      -- rclViewText: the text subrectangle (which
  *         is rclViewPaint minus borders).
+ *
+ *@@changed WarpIN V1.0.18 (2008-11-16) [pr]: fix cut/paste/typo. errors @@fixes 1086
  */
 
@@ -1985 +1989 @@
     ptxvd->rclViewText.yBottom = ptxvd->rclViewPaint.yBottom + ptxvd->cdata.ulYBorder;
     ptxvd->rclViewText.xRight = ptxvd->rclViewPaint.xRight - ptxvd->cdata.ulXBorder;
-    ptxvd->rclViewText.yTop = ptxvd->rclViewPaint.yTop - ptxvd->cdata.ulXBorder;
+    ptxvd->rclViewText.yTop = ptxvd->rclViewPaint.yTop - ptxvd->cdata.ulYBorder;  // WarpIN V1.0.18
 
     // now reposition scroll bars; their sizes may change
@@ -1995 +1999 @@
         ulOfs = 0;
         if (ptxvd->fHScrollVisible)
-            ulOfs = ulScrollCX;
+            ulOfs = ulScrollCY;  // WarpIN V1.0.18
         WinSetWindowPos(ptxvd->hwndVScroll,
                         HWND_TOP,
@@ -2027 +2031 @@
  *
  *@@changed V0.9.3 (2000-05-05) [umoeller]: fixed buggy vertical scroll bars
+ *@@changed WarpIN V1.0.18 (2008-11-16) [pr]: fix buggy horiz. scroll bars @@fixes 1086
  */
 
@@ -2103 +2108 @@
                     AdjustViewRects(hwndTextView,
                                     ptxvd);
+                    FormatText2Screen(hwndTextView,  // WarpIN V1.0.18
+                                      ptxvd,
+                                      TRUE,   // fAlreadyRecursing
+                                      FALSE);   // quick format
                 }
         }
@@ -2767 +2776 @@
  *
  *@@added V1.0.0 (2002-08-12) [umoeller]
+ *@@changed WarpIN V1.0.18 (2008-11-16) [pr]: added correct ID for horiz. scroll @@fixes 1086
  */
 
@@ -2804 +2814 @@
                     ulMsg = WM_HSCROLL;
                     usCmd = SB_LINERIGHT;
+                    usID = ID_HSCROLL;  // WarpIN V1.0.18
                 break;
 
@@ -2809 +2820 @@
                     ulMsg = WM_HSCROLL;
                     usCmd = SB_LINELEFT;
+                    usID = ID_HSCROLL;  // WarpIN V1.0.18
                 break;
 
@@ -2838 +2850 @@
                         ulMsg = WM_VSCROLL;
                     else
+                    {
                         ulMsg = WM_HSCROLL;
+                        usID = ID_HSCROLL;  // WarpIN V1.0.18
+                    }
 
                     sPos = 0;
@@ -2855 +2870 @@
                         ulMsg = WM_HSCROLL;
                         sPos = ptxvd->xfd.szlWorkspace.cx;
+                        usID = ID_HSCROLL;  // WarpIN V1.0.18
                     }
 

branches/branch-1-0/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
@@ -1857 +1857 @@
  *      Terminology:
  *
- *      -- "window": the actual window with scroll bars which displays
- *         a subrectangle of the available data. With a typical PM
- *         application, this will be your client window.
- *
- *         The width or height of this must be passed in ulWinPels.
- *
- *      -- "viewport": the entire data to be displayed, of which the
- *         "window" can only display a subrectangle, if the viewport
- *         is larger than the window.
- *
- *         The width or height of this must be passed in ulViewportPels.
- *         This can be smaller than ulWinPels (if the window is larger
- *         than the data) or the same or larger than ulWinPels
- *         (if the window is too small to show all the data).
- *
- *      -- "window offset": the offset of the current window within
- *         the viewport.
- *
- *         For horizontal scroll bars, this is the X coordinate,
- *         counting from the left of the window (0 means leftmost).
- *
- *         For vertical scroll bars, this is counted from the _top_
- *         of the viewport (0 means topmost, as opposed to OS/2
- *         window coordinates!). This is because for vertical scroll
- *         bars controls, higher values move the thumb _down_. Yes
- *         indeed, this conflicts with PM's coordinate system.
- *
- *         The window offset is therefore always positive.
- *
- *      The scroll bar gets disabled if the entire viewport is visible,
- *      that is, if ulViewportPels <= ulWinPels. In that case
+ *      --  "window": the actual window with scroll bars which displays
+ *          a subrectangle of the available data. With a typical PM
+ *          application, this will be your client window.
+ *
+ *          The width or height of this must be passed in ulWinPels.
+ *
+ *      --  "workarea": the entire data to be displayed, of which the
+ *          "window" can only display a subrectangle, if the workarea
+ *          is larger than the window.
+ *
+ *          The width or height of this must be passed in ulWorkareaPels.
+ *          This can be smaller than ulWinPels (if the window is larger
+ *          than the data) or the same or larger than ulWinPels
+ *          (if the window is too small to show all the data).
+ *
+ *          This value is exclusive in the sense that the maximum
+ *          window offset (below) can be the workarea minus one.
+ *
+ *      --  "window offset": the zero-based offset of the current
+ *          window within the workarea, whose maximum value is
+ *          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).
+ *
+ *          For vertical scroll bars, this is counted from the _top_
+ *          of the workarea (0 means topmost, as opposed to OS/2
+ *          window coordinates!). This is because for vertical scroll
+ *          bars controls, higher values move the thumb _down_. Yes
+ *          indeed, this conflicts with PM's coordinate system.
+ *
+ *          The window offset is therefore always positive.
+ *
+ *      The scroll bar gets disabled if the entire workarea is visible,
+ *      that is, if ulWorkareaPels <= ulWinPels. In that case
  *      FALSE is returned. If (fAutoHide == TRUE), the scroll
  *      bar is not only disabled, but also hidden from the display.
  *      In that case, you will need to reformat your output because
- *      your viewport becomes larger without the scroll bar.
+ *      your workarea becomes larger without the scroll bar.
  *
  *      This function will set the range of the scroll bar to 0 up
- *      to a value depending on the viewport size. For vertical scroll
+ *      to a value depending on the workarea size. For vertical scroll
  *      bars, 0 means topmost (which is kinda sick with the OS/2
  *      coordinate system), for horizontal scroll bars, 0 means leftmost.
@@ -1900 +1910 @@
  *      The maximum value of the scroll bar will be
  *
- +          (ulViewportPels - ulWinPels) / usScrollUnitPels
+ +          (ulWorkareaPels - ulWinPels) / usScrollUnitPels
  *
  *      The thumb size of the scroll bar will also be adjusted
- *      based on the viewport and window size, as it should be.
+ *      based on the workarea and window size, as it should be.
  *
  *@@added V0.9.1 (2000-02-14) [umoeller]
  *@@changed V0.9.3 (2000-04-30) [umoeller]: fixed pels/unit confusion
  *@@changed V0.9.3 (2000-05-08) [umoeller]: now handling scroll units automatically
+ *@@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
  */
 
@@ -1914 +1928 @@
                                                 // visible window part (in pixels),
                                                 // excluding the scroll bar!
-                         ULONG ulViewportPels,  // in: dimension of total data part, of
+                         ULONG ulWorkareaPels,  // in: dimension of total data part, of
                                                 // which ulWinPels is a sub-dimension
                                                 // (in pixels);
@@ -1925 +1939 @@
     BOOL brc = FALSE;
 
-    // _Pmpf(("Entering winhUpdateScrollBar"));
-
-    // for large viewports, adjust scroll bar units
-    USHORT  usScrollUnitPels = 1;
-    if (ulViewportPels > 10000)
-        usScrollUnitPels = 100;
-
-    if (ulViewportPels > ulWinPels)
-    {
+    if (ulWorkareaPels > ulWinPels) // WarpIN V1.0.18
+    {
+        // for large workareas, adjust scroll bar units
+        USHORT  usDivisor = 1, usRounder;
+        USHORT  lMaxAllowedUnitOfs;
+
+        if (ulWorkareaPels > 10000)
+            usDivisor = 100;
+
+        usRounder = usDivisor - 1;  // WarpIN V1.0.18
         // scrollbar needed:
-        USHORT  usThumbDivisorUnits = usScrollUnitPels;
-        USHORT  lMaxAllowedUnitOfs;
-        // _Pmpf(("winhUpdateScrollBar: ulViewportPels > ulWinPels, enabling scroller"));
-        // divisor for thumb size (below)
-        if (ulViewportPels > 10000)
-            // for very large viewports, we need to
-            // raise the divisor, because we only
-            // have a USHORT
-            usThumbDivisorUnits = usScrollUnitPels * 100;
-
-        // viewport is larger than window:
+
+        // workarea is larger than window:
         WinEnableWindow(hwndScrollBar, TRUE);
         if (fAutoHide)
@@ -1951 +1957 @@
 
         // calculate limit
-        lMaxAllowedUnitOfs = ((ulViewportPels - ulWinPels + usScrollUnitPels)
-                               // scroll unit is 10
-                               / usScrollUnitPels);
-
-        // _Pmpf(("    usCurUnitOfs: %d", ulCurUnitOfs));
-        // _Pmpf(("    usMaxUnits: %d", lMaxAllowedUnitOfs));
+        lMaxAllowedUnitOfs =   (ulWorkareaPels - ulWinPels + usRounder)
+                             / usDivisor;
 
         // set thumb position and limit
         WinSendMsg(hwndScrollBar,
                    SBM_SETSCROLLBAR,
-                   (MPARAM)(ulCurPelsOfs), //  / usThumbDivisorUnits),   // position: 0 means top
+                   (MPARAM)((ulCurPelsOfs + usRounder) / usDivisor),   // position: 0 means top
                    MPFROM2SHORT(0,  // minimum
                                 lMaxAllowedUnitOfs));    // maximum
 
         // set thumb size based on ulWinPels and
-        // ulViewportPels
+        // ulWorkareaPels
         WinSendMsg(hwndScrollBar,
                    SBM_SETTHUMBSIZE,
-                   MPFROM2SHORT(    ulWinPels / usThumbDivisorUnits,       // visible
-                                    ulViewportPels / usThumbDivisorUnits), // total
+                   MPFROM2SHORT(    (ulWinPels + usRounder) / usDivisor,       // visible
+                                    (ulWorkareaPels + usRounder) / usDivisor), // total
                    0);
         brc = TRUE;
@@ -1976 +1978 @@
     else
     {
-        // _Pmpf(("winhUpdateScrollBar: ulViewportPels <= ulWinPels"));
-        // entire viewport is visible:
+        // entire workarea is visible:
         WinEnableWindow(hwndScrollBar, FALSE);
         if (fAutoHide)
@@ -2026 +2027 @@
  *@@changed V0.9.3 (2000-05-08) [umoeller]: now handling scroll units automatically
  *@@changed V0.9.7 (2001-01-17) [umoeller]: changed PLONG to PULONG
+ *@@changed WarpIN V1.0.18 (2008-11-16) [pr]: fix rounding error @@fixes 1086
  */
 
@@ -2127 +2129 @@
         WinSendMsg(hwndScrollBar,
                    SBM_SETPOS,
-                   (MPARAM)(*pulCurPelsOfs / usScrollUnitPels), //  / usScrollUnit),
+                   (MPARAM)((*pulCurPelsOfs + (usScrollUnitPels / 2)) / usScrollUnitPels),
+                   (MPARAM)((*pulCurPelsOfs + (usScrollUnitPels / 2)) / usScrollUnitPels),  // WarpIN V1.0.18
                    0);
         // scroll window rectangle: