Changeset 1860 for trunk/src/user32/edit.cpp

Timestamp:

Nov 27, 1999, 3:16:35 PM (26 years ago)

Author:

cbratschi

Message:

edit fixes, monitor API

File:

• trunk/src/user32/edit.cpp (modified) (10 diffs)

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.18 1999-11-26 17:06:06 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.19 1999-11-27 14:16:34 cbratschi Exp $ */
 /*
  *      Edit control
@@ -20 +20 @@
 
 /* CB: todo
-  - WM_MOUSEMOVE: vert lines invalidate bug
   - EN_UPDATE: send before update
   - EN_CHANGE: send after update -> WM_PAINT isn't the right place
@@ -38 +37 @@
 
 #define BUFLIMIT_MULTI          65534   /* maximum buffer size (not including '\0')
-                                           FIXME: BTW, new specs say 65535 (do you dare ???) */
+                                           FIXME: BTW, Win95 specs say 65535 (do you dare ???) */
 #define BUFLIMIT_SINGLE         32766   /* maximum buffer size (not including '\0') */
 #define BUFSTART_MULTI          1024    /* starting size */
@@ -1018 +1017 @@
 {
         INT line_index =  EDIT_EM_LineIndex(hwnd, es, line);
-//CB: fix
+
         if (es->style & ES_MULTILINE)
                 rc->top = es->format_rect.top + (line - es->y_offset) * es->line_height;
@@ -1025 +1024 @@
         rc->bottom = rc->top + es->line_height;
         rc->left = (scol == 0) ? es->format_rect.left : SLOWORD(EDIT_EM_PosFromChar(hwnd, es, line_index + scol, TRUE));
-        rc->right = (ecol == -1) ? es->format_rect.right : SLOWORD(EDIT_EM_PosFromChar(hwnd, es, line_index + ecol, TRUE));
+        rc->right = (ecol == -1) ? es->format_rect.right : SLOWORD(EDIT_EM_PosFromChar(hwnd, es, line_index + ecol, TRUE))+1;
 }
 
@@ -1091 +1090 @@
 
         EDIT_GetLineRect(hwnd, es, 0, start, end, &line_rect);
+
+        //CB: fix 1 pixel vertical line bug
+        line_rect.left--;
+        line_rect.right++;
+
         if (IntersectRect(&rc, &line_rect, &es->format_rect))
         {
@@ -1139 +1143 @@
         if (sl == el) {
                 EDIT_GetLineRect(hwnd, es, sl, sc, ec, &rcLine);
+
+                //CB: fix 1 pixel vertical line bug
+                rcLine.left--;
+                rcLine.right++;
+
+
                 if (IntersectRect(&rcUpdate, &rcWnd, &rcLine))
                         InvalidateRect(hwnd, &rcUpdate, FALSE);
@@ -2846 +2856 @@
         RECT rc;
 
+        HideCaret(hwnd);
+
         if (!es->bEnableState || (es->style & ES_READONLY))
                 brush = (HBRUSH)EDIT_SEND_CTLCOLORSTATIC(hwnd, dc);
@@ -2855 +2867 @@
 
         GetClientRect(hwnd, &rc);
-        IntersectClipRect(dc, rc.left, rc.top, rc.right, rc.bottom); CB:
+        IntersectClipRect(dc, rc.left, rc.top, rc.right, rc.bottom);
         GetClipBox(dc, &rc);
         /*
@@ -2864 +2876 @@
          */
         FillRect(dc, &rc, brush);
+
+        ShowCaret(hwnd);
+
         return -1;
 }