Changeset 313

Timestamp:

Apr 14, 2006, 1:12:56 AM (19 years ago)

Author:

pr

Message:

Fix split window cosmetics. Bug 228

Files:

• branches/branch-1-0/src/helpers/cctl_splitwin.c (modified) (8 diffs)
• trunk/src/helpers/cctl_splitwin.c (modified) (8 diffs)

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

@@ -15 +15 @@
 
 /*
- *      Copyright (C) 1997-2000 Ulrich M”ller.
+ *      Copyright (C) 1997-2006 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -274 +274 @@
  *
  *@@added V0.9.1 (2000-02-05) [umoeller]
+ *@@changed XWP V1.0.5 (2006-04-13) [pr]: Fix horrid rounding errors
  */
 
@@ -359 +360 @@
                 WinQueryWindowRect(pData->sbcd.hwndParentAndOwner,
                                    &rclClient);
-                pData->sbcd.lPos = ulNewYPos
-                                   * 100 / (rclClient.yTop - rclClient.yBottom);
+                // XWP V1.0.5 (2006-04-13) [pr]: Fix horrid rounding errors
+                pData->sbcd.lPos = (ulNewYPos * 200 + (rclClient.yTop - rclClient.yBottom))
+                                   / ((rclClient.yTop - rclClient.yBottom) * 2);
             }
             else
@@ -393 +395 @@
                 WinQueryWindowRect(pData->sbcd.hwndParentAndOwner,
                                    &rclClient);
-                pData->sbcd.lPos = ulNewXPos
-                                   * 100 / (rclClient.xRight - rclClient.xLeft);
+                // XWP V1.0.5 (2006-04-13) [pr]: Fix horrid rounding errors
+                pData->sbcd.lPos = (ulNewXPos * 200 + (rclClient.xRight - rclClient.xLeft))
+                                   / ((rclClient.xRight - rclClient.xLeft) * 2);
             }
             else
@@ -824 +827 @@
  *@@added V0.9.0 [umoeller]
  *@@changed V1.0.0 (2002-08-24) [umoeller]: added support for SBCF_3DEXPLORERSTYLE
+ *@@changed XWP V1.0.5 (2006-04-13) [pr]: Fix rounding errors and repaint problems @@fixes 228
  */
 
@@ -861 +865 @@
             if (psbcd->ulCreateFlags & SBCF_PERCENTAGE)
                 // take height of client and apply percentage
-                rclBar.yBottom = (rclSplit.yTop - rclSplit.yBottom)
-                                * psbcd->lPos
+                // XWP V1.0.5 (2006-04-13) [pr]: Fix horrid rounding errors
+                rclBar.yBottom = ((rclSplit.yTop - rclSplit.yBottom)
+                                * psbcd->lPos + 50)
                                 / 100;
             else
@@ -885 +890 @@
             if (psbcd->ulCreateFlags & SBCF_PERCENTAGE)
                 // take width of client and apply percentage
-                rclBar.xLeft = (rclSplit.xRight - rclSplit.xLeft)
-                                * psbcd->lPos
+                // XWP V1.0.5 (2006-04-13) [pr]: Fix horrid rounding errors
+                rclBar.xLeft = ((rclSplit.xRight - rclSplit.xLeft)
+                                * psbcd->lPos + 50)
                                 / 100;
             else
@@ -985 +991 @@
                           NULL,         // all
                           FALSE);       // don't repaint children
+        // XWP V1.0.5 (2006-04-13) [pr]: repaint right/bottom frame @@fixes 228
+        WinInvalidateRect(psbd->hwndLinked2,
+                          NULL,
+                          TRUE);
     }
 

trunk/src/helpers/cctl_splitwin.c

@@ -15 +15 @@
 
 /*
- *      Copyright (C) 1997-2000 Ulrich M”ller.
+ *      Copyright (C) 1997-2006 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -274 +274 @@
  *
  *@@added V0.9.1 (2000-02-05) [umoeller]
+ *@@changed XWP V1.0.5 (2006-04-13) [pr]: Fix horrid rounding errors
  */
 
@@ -359 +360 @@
                 WinQueryWindowRect(pData->sbcd.hwndParentAndOwner,
                                    &rclClient);
-                pData->sbcd.lPos = ulNewYPos
-                                   * 100 / (rclClient.yTop - rclClient.yBottom);
+                // XWP V1.0.5 (2006-04-13) [pr]: Fix horrid rounding errors
+                pData->sbcd.lPos = (ulNewYPos * 200 + (rclClient.yTop - rclClient.yBottom))
+                                   / ((rclClient.yTop - rclClient.yBottom) * 2);
             }
             else
@@ -393 +395 @@
                 WinQueryWindowRect(pData->sbcd.hwndParentAndOwner,
                                    &rclClient);
-                pData->sbcd.lPos = ulNewXPos
-                                   * 100 / (rclClient.xRight - rclClient.xLeft);
+                // XWP V1.0.5 (2006-04-13) [pr]: Fix horrid rounding errors
+                pData->sbcd.lPos = (ulNewXPos * 200 + (rclClient.xRight - rclClient.xLeft))
+                                   / ((rclClient.xRight - rclClient.xLeft) * 2);
             }
             else
@@ -824 +827 @@
  *@@added V0.9.0 [umoeller]
  *@@changed V1.0.0 (2002-08-24) [umoeller]: added support for SBCF_3DEXPLORERSTYLE
+ *@@changed XWP V1.0.5 (2006-04-13) [pr]: Fix rounding errors and repaint problems @@fixes 228
  */
 
@@ -861 +865 @@
             if (psbcd->ulCreateFlags & SBCF_PERCENTAGE)
                 // take height of client and apply percentage
-                rclBar.yBottom = (rclSplit.yTop - rclSplit.yBottom)
-                                * psbcd->lPos
+                // XWP V1.0.5 (2006-04-13) [pr]: Fix horrid rounding errors
+                rclBar.yBottom = ((rclSplit.yTop - rclSplit.yBottom)
+                                * psbcd->lPos + 50)
                                 / 100;
             else
@@ -885 +890 @@
             if (psbcd->ulCreateFlags & SBCF_PERCENTAGE)
                 // take width of client and apply percentage
-                rclBar.xLeft = (rclSplit.xRight - rclSplit.xLeft)
-                                * psbcd->lPos
+                // XWP V1.0.5 (2006-04-13) [pr]: Fix horrid rounding errors
+                rclBar.xLeft = ((rclSplit.xRight - rclSplit.xLeft)
+                                * psbcd->lPos + 50)
                                 / 100;
             else
@@ -985 +991 @@
                           NULL,         // all
                           FALSE);       // don't repaint children
+        // XWP V1.0.5 (2006-04-13) [pr]: repaint right/bottom frame @@fixes 228
+        WinInvalidateRect(psbd->hwndLinked2,
+                          NULL,
+                          TRUE);
     }