[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
rjw
rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:55:45 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 384761690687d67ab8976ab8d20137aa3a955304
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Feb 16 21:44:22 2002 +0000
Fixed problem with default text not showing up in text area.
Fixed problem with scroll widgets not showing up in select list.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@630 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 0e4f9a9..bbba9e8 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-02-16 Richard Williamson <rjw at apple.com>
+
+ Fixed problem with default text not showing up in text area.
+ Fixed problem with scroll widgets not showing up in select list.
+
+ * src/kdelibs/khtml/rendering/render_form.cpp: (RenderSelect::layout):
+ * src/kwq/KWQListBox.mm: (QListBox::QListBox):
+ * src/kwq/KWQTextArea.mm: (-[KWQTextArea _createTextView]), (-[KWQTextArea
+ initWithFrame:widget:]), (-[KWQTextArea setFrame:]):
+
2002-02-15 Richard Williamson <rjw at apple.com>
Lots of changes to support forms.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0e4f9a9..bbba9e8 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2002-02-16 Richard Williamson <rjw at apple.com>
+
+ Fixed problem with default text not showing up in text area.
+ Fixed problem with scroll widgets not showing up in select list.
+
+ * src/kdelibs/khtml/rendering/render_form.cpp: (RenderSelect::layout):
+ * src/kwq/KWQListBox.mm: (QListBox::QListBox):
+ * src/kwq/KWQTextArea.mm: (-[KWQTextArea _createTextView]), (-[KWQTextArea
+ initWithFrame:widget:]), (-[KWQTextArea setFrame:]):
+
2002-02-15 Richard Williamson <rjw at apple.com>
Lots of changes to support forms.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0e4f9a9..bbba9e8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2002-02-16 Richard Williamson <rjw at apple.com>
+
+ Fixed problem with default text not showing up in text area.
+ Fixed problem with scroll widgets not showing up in select list.
+
+ * src/kdelibs/khtml/rendering/render_form.cpp: (RenderSelect::layout):
+ * src/kwq/KWQListBox.mm: (QListBox::QListBox):
+ * src/kwq/KWQTextArea.mm: (-[KWQTextArea _createTextView]), (-[KWQTextArea
+ initWithFrame:widget:]), (-[KWQTextArea setFrame:]):
+
2002-02-15 Richard Williamson <rjw at apple.com>
Lots of changes to support forms.
diff --git a/WebCore/khtml/rendering/render_form.cpp b/WebCore/khtml/rendering/render_form.cpp
index d2d928b..025a870 100644
--- a/WebCore/khtml/rendering/render_form.cpp
+++ b/WebCore/khtml/rendering/render_form.cpp
@@ -991,6 +991,9 @@ void RenderSelect::layout( )
#ifdef _KWQ_
width += w->scrollBarWidth();
height = size*height;
+ // NSBrowser has problems drawing scrollbar correctly when it's size is too small.
+ if (height < 60)
+ height = 60;
#else
width += 2*w->frameWidth() + w->verticalScrollBar()->sizeHint().width();
height = size*height + 2*w->frameWidth();
diff --git a/WebCore/kwq/KWQListBox.mm b/WebCore/kwq/KWQListBox.mm
index 58b99be..9af003e 100644
--- a/WebCore/kwq/KWQListBox.mm
+++ b/WebCore/kwq/KWQListBox.mm
@@ -93,6 +93,9 @@ QListBox::QListBox()
head = 0L;
+ // FIXME: Need to configure browser's scroll view to use a scroller that
+ // has no up/down buttons. Typically the browser is very small and won't
+ // have enough space to draw the up/down buttons and the scroll knob.
[browser setTitled: NO];
[browser setDelegate: delegate];
[browser setTarget: delegate];
diff --git a/WebCore/kwq/KWQTextArea.mm b/WebCore/kwq/KWQTextArea.mm
index 537feda..1d67d62 100644
--- a/WebCore/kwq/KWQTextArea.mm
+++ b/WebCore/kwq/KWQTextArea.mm
@@ -69,8 +69,8 @@ const float LargeNumberForText = 1.0e7;
if (frame.size.width > 0 && frame.size.height > 0)
textFrame.size = [NSScrollView contentSizeForFrameSize:frame.size hasHorizontalScroller:NO hasVerticalScroller:YES borderType: [self borderType]];
else {
- textFrame.size.width = 0;
- textFrame.size.height = 0;
+ textFrame.size.width = LargeNumberForText;
+ textFrame.size.height = LargeNumberForText;
}
textView = [[NSTextView alloc] initWithFrame: textFrame];
@@ -97,7 +97,7 @@ const float LargeNumberForText = 1.0e7;
[self setHasHorizontalScroller: NO];
[self setBorderType: NSLineBorder];
- if (r.size.width > 0 && r.size.height > 0)
+ //if (r.size.width > 0 && r.size.height > 0)
[self _createTextView];
widget = w;
@@ -239,10 +239,21 @@ const float LargeNumberForText = 1.0e7;
- (void)setFrame:(NSRect)frameRect
{
+ NSRect textFrame;
+ NSSize contentSize;
+
[super setFrame:frameRect];
- if (frameRect.size.width > 0 && frameRect.size.height > 0 && textView == nil)
- [self _createTextView];
+ if ([self wordWrap]){
+ contentSize = [NSScrollView contentSizeForFrameSize:frameRect.size hasHorizontalScroller:[self hasHorizontalScroller] hasVerticalScroller:[self hasVerticalScroller] borderType:[self borderType]];
+ textFrame = [textView frame];
+ textFrame.size.width = contentSize.width;
+ contentSize.height = LargeNumberForText;
+ [textView setFrame: textFrame];
+ [[textView textContainer] setContainerSize: contentSize];
+ }
+ //if (frameRect.size.width > 0 && frameRect.size.height > 0 && textView == nil)
+ // [self _createTextView];
}
diff --git a/WebCore/src/kdelibs/khtml/rendering/render_form.cpp b/WebCore/src/kdelibs/khtml/rendering/render_form.cpp
index d2d928b..025a870 100644
--- a/WebCore/src/kdelibs/khtml/rendering/render_form.cpp
+++ b/WebCore/src/kdelibs/khtml/rendering/render_form.cpp
@@ -991,6 +991,9 @@ void RenderSelect::layout( )
#ifdef _KWQ_
width += w->scrollBarWidth();
height = size*height;
+ // NSBrowser has problems drawing scrollbar correctly when it's size is too small.
+ if (height < 60)
+ height = 60;
#else
width += 2*w->frameWidth() + w->verticalScrollBar()->sizeHint().width();
height = size*height + 2*w->frameWidth();
diff --git a/WebCore/src/kwq/KWQListBox.mm b/WebCore/src/kwq/KWQListBox.mm
index 58b99be..9af003e 100644
--- a/WebCore/src/kwq/KWQListBox.mm
+++ b/WebCore/src/kwq/KWQListBox.mm
@@ -93,6 +93,9 @@ QListBox::QListBox()
head = 0L;
+ // FIXME: Need to configure browser's scroll view to use a scroller that
+ // has no up/down buttons. Typically the browser is very small and won't
+ // have enough space to draw the up/down buttons and the scroll knob.
[browser setTitled: NO];
[browser setDelegate: delegate];
[browser setTarget: delegate];
diff --git a/WebCore/src/kwq/KWQTextArea.mm b/WebCore/src/kwq/KWQTextArea.mm
index 537feda..1d67d62 100644
--- a/WebCore/src/kwq/KWQTextArea.mm
+++ b/WebCore/src/kwq/KWQTextArea.mm
@@ -69,8 +69,8 @@ const float LargeNumberForText = 1.0e7;
if (frame.size.width > 0 && frame.size.height > 0)
textFrame.size = [NSScrollView contentSizeForFrameSize:frame.size hasHorizontalScroller:NO hasVerticalScroller:YES borderType: [self borderType]];
else {
- textFrame.size.width = 0;
- textFrame.size.height = 0;
+ textFrame.size.width = LargeNumberForText;
+ textFrame.size.height = LargeNumberForText;
}
textView = [[NSTextView alloc] initWithFrame: textFrame];
@@ -97,7 +97,7 @@ const float LargeNumberForText = 1.0e7;
[self setHasHorizontalScroller: NO];
[self setBorderType: NSLineBorder];
- if (r.size.width > 0 && r.size.height > 0)
+ //if (r.size.width > 0 && r.size.height > 0)
[self _createTextView];
widget = w;
@@ -239,10 +239,21 @@ const float LargeNumberForText = 1.0e7;
- (void)setFrame:(NSRect)frameRect
{
+ NSRect textFrame;
+ NSSize contentSize;
+
[super setFrame:frameRect];
- if (frameRect.size.width > 0 && frameRect.size.height > 0 && textView == nil)
- [self _createTextView];
+ if ([self wordWrap]){
+ contentSize = [NSScrollView contentSizeForFrameSize:frameRect.size hasHorizontalScroller:[self hasHorizontalScroller] hasVerticalScroller:[self hasVerticalScroller] borderType:[self borderType]];
+ textFrame = [textView frame];
+ textFrame.size.width = contentSize.width;
+ contentSize.height = LargeNumberForText;
+ [textView setFrame: textFrame];
+ [[textView textContainer] setContainerSize: contentSize];
+ }
+ //if (frameRect.size.width > 0 && frameRect.size.height > 0 && textView == nil)
+ // [self _createTextView];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list