Changeset 373 for trunk/src/helpers/textview.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/textview.c (modified) (15 diffs)

trunk/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)
@@ -1954 +1956 @@
  *      -- 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
  */
 
@@ -1984 +1988 @@
     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
@@ -1994 +1998 @@
         ulOfs = 0;
         if (ptxvd->fHScrollVisible)
-            ulOfs = ulScrollCX;
+            ulOfs = ulScrollCY;  // WarpIN V1.0.18
         WinSetWindowPos(ptxvd->scrw.hwndVScroll,
                         HWND_TOP,
@@ -2026 +2030 @@
  *
  *@@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
  */
 
@@ -2102 +2107 @@
                     AdjustViewRects(hwndTextView,
                                     ptxvd);
+                    FormatText2Screen(hwndTextView,  // WarpIN V1.0.18
+                                      ptxvd,
+                                      TRUE,   // fAlreadyRecursing
+                                      FALSE);   // quick format
                 }
         }
@@ -2562 +2571 @@
  *
  *@@added V1.0.1 (2003-01-25) [umoeller]
+ *@@changed WarpIN V1.0.18 (2008-11-16) [pr]: check for horiz. scroll message @@fixes 1086
  */
 
@@ -2585 +2595 @@
                                               mp2);
         }
-        else if (ptxvd->fHScrollVisible)
+        else if (    (msg == WM_HSCROLL)  // WarpIN V1.0.18
+                  && (ptxvd->fHScrollVisible)
+                )
         {
             LONG cx = ptxvd->rclViewText.xRight - ptxvd->rclViewText.xLeft;
@@ -2786 +2798 @@
  *
  *@@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
  */
 
@@ -2823 +2836 @@
                     ulMsg = WM_HSCROLL;
                     usCmd = SB_LINERIGHT;
+                    usID = ID_HSCROLL;  // WarpIN V1.0.18
                 break;
 
@@ -2828 +2842 @@
                     ulMsg = WM_HSCROLL;
                     usCmd = SB_LINELEFT;
+                    usID = ID_HSCROLL;  // WarpIN V1.0.18
                 break;
 
@@ -2857 +2872 @@
                         ulMsg = WM_VSCROLL;
                     else
+                    {
                         ulMsg = WM_HSCROLL;
+                        usID = ID_HSCROLL;  // WarpIN V1.0.18
+                    }
 
                     sPos = 0;
@@ -2874 +2892 @@
                         ulMsg = WM_HSCROLL;
                         sPos = ptxvd->xfd.szlWorkspace.cx;
+                        usID = ID_HSCROLL;  // WarpIN V1.0.18
                     }