[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:52:00 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 0c5b8894b1906cbf134aa8c5105ba72af2166120
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 8 21:15:17 2001 +0000
More fixes to improve layout.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@425 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/kwq/KWQApplication.mm b/WebCore/kwq/KWQApplication.mm
index e2bcd7f..67619bb 100644
--- a/WebCore/kwq/KWQApplication.mm
+++ b/WebCore/kwq/KWQApplication.mm
@@ -74,7 +74,7 @@ void QApplication::restoreOverrideCursor()
bool QApplication::sendEvent(QObject *o, QEvent *e)
{
- _logNotYetImplemented();
+// _logNotYetImplemented();
return FALSE;
}
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index d0cbd14..173b1e1 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -690,7 +690,7 @@ DOM::HTMLDocumentImpl *KHTMLPart::docImpl() const
DOM::DocumentImpl *KHTMLPart::xmlDocImpl() const
{
- _logPartiallyImplemented();
+// _logPartiallyImplemented();
return d->m_doc;
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index d0cbd14..173b1e1 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -690,7 +690,7 @@ DOM::HTMLDocumentImpl *KHTMLPart::docImpl() const
DOM::DocumentImpl *KHTMLPart::xmlDocImpl() const
{
- _logPartiallyImplemented();
+// _logPartiallyImplemented();
return d->m_doc;
}
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index d77966a..ed5b219 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -88,7 +88,7 @@ void QLineEdit::setReadOnly(bool flag)
{
KWQNSTextField *field = (KWQNSTextField *)getView();
- return [field setEditable: flag];
+ return [field setEditable: flag?NO:YES];
}
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index 9e7f1e6..aeed1ec 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -146,7 +146,8 @@ void QScrollView::addChild(QWidget* child, int x, int y)
subView = child->getView();
[subView removeFromSuperview];
- NSLog (@"Adding %@ at (%d,%d)\n", [[subView class] className], x, y);
+ NSRect wFrame = [subView frame];
+ NSLog (@"Adding %@ at (%d,%d) w %d h %d\n", [[subView class] className], x, y, (int)wFrame.size.width, (int)wFrame.size.height);
[thisView addSubview: subView];
}
diff --git a/WebCore/kwq/KWQView.h b/WebCore/kwq/KWQView.h
index a00496c..17a78b0 100644
--- a/WebCore/kwq/KWQView.h
+++ b/WebCore/kwq/KWQView.h
@@ -65,6 +65,7 @@ class KHTMLPart;
QWidget *widget;
KHTMLPart *part; // FIXME. This is a temporary reference.
bool isFlipped;
+ bool needsLayout;
}
- initWithFrame: (NSRect)r widget: (QWidget *)w;
- (void)setIsFlipped: (bool)flag;
diff --git a/WebCore/kwq/KWQView.mm b/WebCore/kwq/KWQView.mm
index 758685a..61c78d7 100644
--- a/WebCore/kwq/KWQView.mm
+++ b/WebCore/kwq/KWQView.mm
@@ -87,6 +87,7 @@
[super initWithFrame: r];
widget = w;
isFlipped = YES;
+ needsLayout = YES;
}
@@ -100,13 +101,16 @@
if (((KHTMLView *)widget)->part()->xmlDocImpl() &&
((KHTMLView *)widget)->part()->xmlDocImpl()->renderer()){
- ((KHTMLView *)widget)->layout(TRUE);
+ if (needsLayout){
+ ((KHTMLView *)widget)->layout(TRUE);
+ needsLayout = NO;
+ }
}
-
- ((KHTMLView *)widget)->drawContents( &p, (int)frame.origin.x,
- (int)frame.origin.y,
- (int)frame.size.width,
- (int)frame.size.height );
+
+ ((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
+ (int)rect.origin.y,
+ (int)rect.size.width,
+ (int)rect.size.height );
}
}
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index ef30307..e528e29 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -137,7 +137,7 @@ void QWidget::setAutoMask(bool)
void QWidget::setMouseTracking(bool)
{
- _logNeverImplemented();
+// _logNeverImplemented();
}
@@ -365,7 +365,7 @@ bool QWidget::focusNextPrevChild(bool)
bool QWidget::hasMouseTracking() const
{
- _logNeverImplemented();
+// _logNeverImplemented();
return true;
}
diff --git a/WebCore/src/kwq/KWQApplication.mm b/WebCore/src/kwq/KWQApplication.mm
index e2bcd7f..67619bb 100644
--- a/WebCore/src/kwq/KWQApplication.mm
+++ b/WebCore/src/kwq/KWQApplication.mm
@@ -74,7 +74,7 @@ void QApplication::restoreOverrideCursor()
bool QApplication::sendEvent(QObject *o, QEvent *e)
{
- _logNotYetImplemented();
+// _logNotYetImplemented();
return FALSE;
}
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index d0cbd14..173b1e1 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -690,7 +690,7 @@ DOM::HTMLDocumentImpl *KHTMLPart::docImpl() const
DOM::DocumentImpl *KHTMLPart::xmlDocImpl() const
{
- _logPartiallyImplemented();
+// _logPartiallyImplemented();
return d->m_doc;
}
diff --git a/WebCore/src/kwq/KWQLineEdit.mm b/WebCore/src/kwq/KWQLineEdit.mm
index d77966a..ed5b219 100644
--- a/WebCore/src/kwq/KWQLineEdit.mm
+++ b/WebCore/src/kwq/KWQLineEdit.mm
@@ -88,7 +88,7 @@ void QLineEdit::setReadOnly(bool flag)
{
KWQNSTextField *field = (KWQNSTextField *)getView();
- return [field setEditable: flag];
+ return [field setEditable: flag?NO:YES];
}
diff --git a/WebCore/src/kwq/KWQScrollView.mm b/WebCore/src/kwq/KWQScrollView.mm
index 9e7f1e6..aeed1ec 100644
--- a/WebCore/src/kwq/KWQScrollView.mm
+++ b/WebCore/src/kwq/KWQScrollView.mm
@@ -146,7 +146,8 @@ void QScrollView::addChild(QWidget* child, int x, int y)
subView = child->getView();
[subView removeFromSuperview];
- NSLog (@"Adding %@ at (%d,%d)\n", [[subView class] className], x, y);
+ NSRect wFrame = [subView frame];
+ NSLog (@"Adding %@ at (%d,%d) w %d h %d\n", [[subView class] className], x, y, (int)wFrame.size.width, (int)wFrame.size.height);
[thisView addSubview: subView];
}
diff --git a/WebCore/src/kwq/KWQView.h b/WebCore/src/kwq/KWQView.h
index a00496c..17a78b0 100644
--- a/WebCore/src/kwq/KWQView.h
+++ b/WebCore/src/kwq/KWQView.h
@@ -65,6 +65,7 @@ class KHTMLPart;
QWidget *widget;
KHTMLPart *part; // FIXME. This is a temporary reference.
bool isFlipped;
+ bool needsLayout;
}
- initWithFrame: (NSRect)r widget: (QWidget *)w;
- (void)setIsFlipped: (bool)flag;
diff --git a/WebCore/src/kwq/KWQView.mm b/WebCore/src/kwq/KWQView.mm
index 758685a..61c78d7 100644
--- a/WebCore/src/kwq/KWQView.mm
+++ b/WebCore/src/kwq/KWQView.mm
@@ -87,6 +87,7 @@
[super initWithFrame: r];
widget = w;
isFlipped = YES;
+ needsLayout = YES;
}
@@ -100,13 +101,16 @@
if (((KHTMLView *)widget)->part()->xmlDocImpl() &&
((KHTMLView *)widget)->part()->xmlDocImpl()->renderer()){
- ((KHTMLView *)widget)->layout(TRUE);
+ if (needsLayout){
+ ((KHTMLView *)widget)->layout(TRUE);
+ needsLayout = NO;
+ }
}
-
- ((KHTMLView *)widget)->drawContents( &p, (int)frame.origin.x,
- (int)frame.origin.y,
- (int)frame.size.width,
- (int)frame.size.height );
+
+ ((KHTMLView *)widget)->drawContents( &p, (int)rect.origin.x,
+ (int)rect.origin.y,
+ (int)rect.size.width,
+ (int)rect.size.height );
}
}
diff --git a/WebCore/src/kwq/KWQWidget.mm b/WebCore/src/kwq/KWQWidget.mm
index ef30307..e528e29 100644
--- a/WebCore/src/kwq/KWQWidget.mm
+++ b/WebCore/src/kwq/KWQWidget.mm
@@ -137,7 +137,7 @@ void QWidget::setAutoMask(bool)
void QWidget::setMouseTracking(bool)
{
- _logNeverImplemented();
+// _logNeverImplemented();
}
@@ -365,7 +365,7 @@ bool QWidget::focusNextPrevChild(bool)
bool QWidget::hasMouseTracking() const
{
- _logNeverImplemented();
+// _logNeverImplemented();
return true;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list