Reviewed by Dave Hyatt.

        - fixed <rdar://problem/4123592> Can't resize textareas that have a width specified by a style

        * kwq/KWQTextArea.mm:
        (-[KWQTextArea getNumColumns:andNumRows:forSize:]):
        removed this method, which I had added earlier to set cols and rows correctly
        (-[KWQTextAreaTextView _trackResizeFromMouseDown:]):
        set width and height instead of cols and rows; handle the intrinsic margin that sometimes appears
        on form elements

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9186 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index d156c8bfe8206e6a77f79e721f98425d786e95a8..fef904f7b6bf47a0dd56fde4455cd195efd563c1 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,16 @@
+2005-05-23  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Dave Hyatt.
+        
+        - fixed <rdar://problem/4123592> Can't resize textareas that have a width specified by a style
+
+        * kwq/KWQTextArea.mm:
+        (-[KWQTextArea getNumColumns:andNumRows:forSize:]):
+        removed this method, which I had added earlier to set cols and rows correctly
+        (-[KWQTextAreaTextView _trackResizeFromMouseDown:]):
+        set width and height instead of cols and rows; handle the intrinsic margin that sometimes appears
+        on form elements
+
 2005-05-22  Adele Peterson  <adele@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebCore/kwq/KWQTextArea.mm b/WebCore/kwq/KWQTextArea.mm
index 7fc48320e4683f69d5d0be6908d709938d4b1db8..9891d5e1df9ebcf9a0924d6a6e06c5af5e24b7ce 100644 (file)
--- a/WebCore/kwq/KWQTextArea.mm
+++ b/WebCore/kwq/KWQTextArea.mm
@@ -25,6 +25,7 @@
 
 #import "KWQTextArea.h"
 
+#import "DOMCSS.h"
 #import "DOMHTML.h"
 #import "KWQAssertions.h"
 #import "KWQKHTMLPart.h"
@@ -68,12 +69,6 @@ using khtml::RenderWidget;
 - (void)_KWQ_setBaseWritingDirection:(NSWritingDirection)direction;
 @end
 
-#if ALLOW_RESIZING_TEXTAREAS
-@interface KWQTextArea (KWQTextAreaTextView)
-- (void)getNumColumns:(long*)numColumns andNumRows:(long*)numRows forSize:(NSSize)frameSize;
-@end
-#endif
-
 @interface KWQTextAreaTextView : NSTextView <KWQWidgetHolder>
 {
     QTextEdit *widget;
@@ -567,35 +562,14 @@ static NSRange RangeOfParagraph(NSString *text, int paragraph)
 
 @end
 
-#if ALLOW_RESIZING_TEXTAREAS
-@implementation KWQTextArea (KWQTextAreaTextView)
-
-- (void)getNumColumns:(long*)numColumns andNumRows:(long*)numRows forSize:(NSSize)frameSize
-{
-    ASSERT_ARG(numColumns, numColumns != nil);
-    ASSERT_ARG(numRows, numRows != nil);
-    NSSize textViewSize = [[self class] contentSizeForFrameSize:frameSize
-                                          hasHorizontalScroller:[self hasHorizontalScroller]
-                                            hasVerticalScroller:[self hasVerticalScroller]
-                                                     borderType:[self borderType]];
-    NSSize textContainerInset = [textView textContainerInset];
-    NSSize textContainerSize = NSMakeSize(textViewSize.width - textContainerInset.width, textViewSize.height - textContainerInset.width);
-    NSSize textSize = NSMakeSize(textContainerSize.width - [[textView textContainer] lineFragmentPadding] * 2, textContainerSize.height);
-    *numColumns = (long)(textSize.width/[_font widthOfString:@"0"]);
-    *numRows = (long)(textSize.height/[_font defaultLineHeightForFont]);
-}
-
-@end
-#endif
-
 @implementation KWQTextAreaTextView
 
 static BOOL _spellCheckingInitiallyEnabled = NO;
 static NSString *WebContinuousSpellCheckingEnabled = @"WebContinuousSpellCheckingEnabled";
 
 #if ALLOW_RESIZING_TEXTAREAS
-const long MinimumColsWhileResizing = 10;
-const long MinimumRowsWhileResizing = 2;
+const int MinimumWidthWhileResizing = 100;
+const int MinimumHeightWhileResizing = 40;
 const float ResizeCornerWidth = 16;
 const float ResizeCornerHeight = 16;
 #endif
@@ -743,15 +717,24 @@ const float ResizeCornerHeight = 16;
     DOMHTMLTextAreaElement *element = [bridge elementForView:self];
     ASSERT([element isKindOfClass:[DOMHTMLTextAreaElement class]]);
     
-    long minCols = kMin([element cols], MinimumColsWhileResizing);
-    long minRows = kMin([element rows], MinimumRowsWhileResizing);
-    
     KWQTextArea *textArea = [[self superview] superview];
     ASSERT([textArea isKindOfClass:[KWQTextArea class]]);
     
     NSPoint initialLocalPoint = [self convertPoint:[event locationInWindow] fromView:nil];
     NSSize initialTextAreaSize = [textArea frame].size;
 
+    int minWidth = kMin((int)initialTextAreaSize.width, MinimumWidthWhileResizing);
+    int minHeight = kMin((int)initialTextAreaSize.height, MinimumHeightWhileResizing);
+    
+    BOOL handledIntrinsicMargins = NO;
+    DOMCSSStyleDeclaration *oldComputedStyle = [[element ownerDocument] getComputedStyle:element :@""];
+    NSString *oldMarginLeft = [oldComputedStyle marginLeft];
+    NSString *oldMarginRight = [oldComputedStyle marginRight];
+    NSString *oldMarginTop = [oldComputedStyle marginTop];
+    NSString *oldMarginBottom = [oldComputedStyle marginBottom];
+    
+    DOMCSSStyleDeclaration *inlineStyle = [element style];
+
     for (;;) {
         if ([event type] == NSRightMouseDown || [event type] == NSRightMouseUp) {
             // Ignore right mouse button events and remove them from the queue.
@@ -763,12 +746,28 @@ const float ResizeCornerHeight = 16;
 
             // FIXME Radar 4118564: ideally we'd autoscroll the window as necessary to keep the point under
             // the cursor in view.
-            NSSize newTextAreaSize = NSMakeSize(initialTextAreaSize.width + (localPoint.x - initialLocalPoint.x), 
-                                                initialTextAreaSize.height + (localPoint.y - initialLocalPoint.y));
-            long newCols, newRows;
-            [textArea getNumColumns:&newCols andNumRows:&newRows forSize:newTextAreaSize];
-            [element setCols:kMax(newCols, minCols)];
-            [element setRows:kMax(newRows, minRows)];
+            int newWidth = kMax(minWidth, (int)(initialTextAreaSize.width + (localPoint.x - initialLocalPoint.x)));
+            int newHeight = kMax(minHeight, (int)(initialTextAreaSize.height + (localPoint.y - initialLocalPoint.y)));
+            [inlineStyle setWidth:[NSString stringWithFormat:@"%dpx", newWidth]];
+            [inlineStyle setHeight:[NSString stringWithFormat:@"%dpx", newHeight]];
+            
+            // render_form.cpp has a mechanism to use intrinsic margins on form elements under certain conditions.
+            // Setting the width or height explicitly suppresses the intrinsic margins. We don't want the user's
+            // manual resizing to affect the margins, so we check whether the margin was changed and, if so, compensat
+            // with an explicit margin that matches the old implicit one. We only need to do this once per element.
+            if (!handledIntrinsicMargins) {
+                DOMCSSStyleDeclaration *newComputedStyle = [[element ownerDocument] getComputedStyle:element :@""];
+                if (![oldMarginLeft isEqualToString:[newComputedStyle marginLeft]])
+                    [inlineStyle setMarginLeft:oldMarginLeft];
+                if (![oldMarginRight isEqualToString:[newComputedStyle marginRight]])
+                    [inlineStyle setMarginRight:oldMarginRight];
+                if (![oldMarginTop isEqualToString:[newComputedStyle marginTop]])
+                    [inlineStyle setMarginTop:oldMarginTop];
+                if (![oldMarginBottom isEqualToString:[newComputedStyle marginBottom]])
+                    [inlineStyle setMarginBottom:oldMarginBottom];
+                handledIntrinsicMargins = YES;
+            }
+
             [bridge part]->forceLayout();
         }