[webkit-changes] cvs commit: WebKit/WebView.subproj WebHTMLView.m

[Eric]

eseidel     05/11/26 22:36:32

  Modified:    .        ChangeLog
               WebView.subproj WebHTMLView.m
  Log:
  Bug #: 5230
  Submitted by: ap
  Reviewed by: mjs
          Reviewed by mjs.  Committed by eseidel.
  
          Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5230
          "characterIndexForPoint: not yet implemented"
  
          * WebView.subproj/WebHTMLView.m:
          (-[WebHTMLView characterIndexForPoint:]):
          (-[WebHTMLView firstRectForCharacterRange:]):
  
  Revision  Changes    Path
  1.3374    +11 -0     WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3373
  retrieving revision 1.3374
  diff -u -r1.3373 -r1.3374
  --- ChangeLog	22 Nov 2005 15:27:41 -0000	1.3373
  +++ ChangeLog	27 Nov 2005 06:36:14 -0000	1.3374
  @@ -1,3 +1,14 @@
  +2005-11-26  Alexey Proskuryakov  <ap at nypop.com>
  +
  +        Reviewed by mjs.  Committed by eseidel.
  +
  +        Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5230
  +        "characterIndexForPoint: not yet implemented"
  +
  +        * WebView.subproj/WebHTMLView.m:
  +        (-[WebHTMLView characterIndexForPoint:]):
  +        (-[WebHTMLView firstRectForCharacterRange:]):
  +
   2005-11-22  Darin Adler  <darin at apple.com>
   
           * WebView.subproj/WebView.h: Fixed incorrect comment in public header.
  
  
  
  1.479     +13 -3     WebKit/WebView.subproj/WebHTMLView.m
  
  Index: WebHTMLView.m
  ===================================================================
  RCS file: /cvs/root/WebKit/WebView.subproj/WebHTMLView.m,v
  retrieving revision 1.478
  retrieving revision 1.479
  diff -u -r1.478 -r1.479
  --- WebHTMLView.m	11 Nov 2005 01:15:37 -0000	1.478
  +++ WebHTMLView.m	27 Nov 2005 06:36:30 -0000	1.479
  @@ -4905,8 +4905,18 @@
   
   - (unsigned int)characterIndexForPoint:(NSPoint)thePoint
   {
  -    ERROR("TEXTINPUT: characterIndexForPoint: not yet implemented");
  -    return 0;
  +    NSWindow *window = [self window];
  +    WebBridge *bridge = [self _bridge];
  +
  +    if (window)
  +        thePoint = [window convertScreenToBase:thePoint];
  +    thePoint = [self convertPoint:thePoint fromView:nil];
  +
  +    DOMRange *range = [bridge characterRangeAtPoint:thePoint];
  +    if (!range)
  +        return NSNotFound;
  +    
  +    return [bridge convertDOMRangeToNSRange:range].location;
   }
   
   - (NSRect)firstRectForCharacterRange:(NSRange)theRange
  @@ -4916,7 +4926,7 @@
       DOMRange *range;
       
       if ([self hasMarkedText]) {
  -        range = [bridge convertToObjCDOMRange:theRange];
  +        range = [bridge convertNSRangeToDOMRange:theRange];
       }
       else {
           range = [self _selectedRange];