Changeset 374 for branches/branch-1-0/src/helpers/textview.c

Timestamp:

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

Author:

pr

Message:

Fix scroll bar bugs in textview controls. Bug 1086.

File:

• branches/branch-1-0/src/helpers/textview.c (modified) (13 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
                     }