[fltk.commit] [Library] r5959 - trunk/src

[fltk-dev]

Author: spitzak
Date: 2007-10-17 13:38:11 -0700 (Wed, 17 Oct 2007)
New Revision: 5959
Log:
Fix for STR #1782
HelpView was not rewritten to the x/y relative coordinates of fltk2


Modified:
   trunk/src/HelpView.cxx

Modified: trunk/src/HelpView.cxx
===================================================================
--- trunk/src/HelpView.cxx      2007-10-17 20:21:38 UTC (rev 5958)
+++ trunk/src/HelpView.cxx      2007-10-17 20:38:11 UTC (rev 5959)
@@ -335,9 +335,9 @@
 
 void 
 HelpView::write_text (const char * buf, const char * ptr, int X, int Y, int 
X1, int underline) {
-    drawtext (buf, (float) X+x(), (float) Y+y());
+    drawtext (buf, (float) X, (float) Y);
     if (underline) {
-      fltk_xyline(X+x(), Y+1+y(), X+X1+x());
+      fltk_xyline(X, Y+1, X+X1);
     }
 }
 
@@ -500,8 +500,8 @@
 
              drawtext (buf, float(xx - leftline_), float(yy));
              ww = (int)getwidth(buf);
-             if (underline) fltk_xyline(xx + x() - leftline_, yy + y() + 1,
-                                      xx + x() - leftline_ + ww);
+             if (underline) fltk_xyline(xx - leftline_, yy + 1,
+                                      xx - leftline_ + ww);
               xx += ww;
            }
 
@@ -561,8 +561,7 @@
          }
          else if (strcasecmp(buf, "HR") == 0)
          {
-           fltk_line(block->x + x(), yy + y(), block->w + x(),
-                   yy + y());
+           fltk_line(block->x, yy, block->w, yy);
 
            if (line < 31)
              line ++;
@@ -872,8 +871,8 @@
       if (s > buf && !head)
       {
         drawtext(buf, (float) xx - leftline_, (float) yy );
-       if (underline) fltk_xyline(xx + x() - leftline_, yy + y() + 1,
-                                xx + x() - leftline_ + ww);
+       if (underline) fltk_xyline(xx - leftline_, yy + 1,
+                                xx - leftline_ + ww);
       }
     }
 
@@ -2397,8 +2396,8 @@
          return (1);
 
     case MOVE :
-        xx = event_x() - x() + leftline_;
-        yy = event_y() - y() + topline_;
+        xx = event_x() + leftline_;
+        yy = event_y() + topline_;
        break;
 
     case LEAVE :

_______________________________________________
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit