[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:13 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit c4e2c293b370fc6bb122c1f0b92f2cdec22d3bec
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Feb 6 01:59:59 2002 +0000
Working dynamic scroll bars.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@593 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 69bd2c7..1aeb3d7 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-02-05 Richard Williamson <rjw at apple.com>
+
+ Changes to support dynamic scroll bars in frames/iframes.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent):
+ * src/kwq/KWQScrollView.mm: (QScrollView::addChild),
+ (QScrollView::resizeContents), (QScrollView::updateContents),
+ (QScrollView::repaintContents):
+ * src/kwq/KWQWidget.mm: (QWidget::resize), (QWidget::move),
+ (QWidget::internalSetGeometry):
+
2002-02-05 Kenneth Kocienda <kocienda at apple.com>
Changes to move these last bits of code to the new cache API.
@@ -229,7 +240,6 @@
src/kwq/qt/_qptrdict.h: Avoid causing problems when the relevant
defines are not defined.
->>>>>>> 1.28
2002-01-22 Richard Williamson <rjw at apple.com>
Implemented KWQDesktopWidget to represent main screen. Used by javascript.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 69bd2c7..1aeb3d7 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2002-02-05 Richard Williamson <rjw at apple.com>
+
+ Changes to support dynamic scroll bars in frames/iframes.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent):
+ * src/kwq/KWQScrollView.mm: (QScrollView::addChild),
+ (QScrollView::resizeContents), (QScrollView::updateContents),
+ (QScrollView::repaintContents):
+ * src/kwq/KWQWidget.mm: (QWidget::resize), (QWidget::move),
+ (QWidget::internalSetGeometry):
+
2002-02-05 Kenneth Kocienda <kocienda at apple.com>
Changes to move these last bits of code to the new cache API.
@@ -229,7 +240,6 @@
src/kwq/qt/_qptrdict.h: Avoid causing problems when the relevant
defines are not defined.
->>>>>>> 1.28
2002-01-22 Richard Williamson <rjw at apple.com>
Implemented KWQDesktopWidget to represent main screen. Used by javascript.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 69bd2c7..1aeb3d7 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2002-02-05 Richard Williamson <rjw at apple.com>
+
+ Changes to support dynamic scroll bars in frames/iframes.
+
+ * src/kwq/KWQKHTMLPart.mm: (KHTMLPart::khtmlMouseReleaseEvent):
+ * src/kwq/KWQScrollView.mm: (QScrollView::addChild),
+ (QScrollView::resizeContents), (QScrollView::updateContents),
+ (QScrollView::repaintContents):
+ * src/kwq/KWQWidget.mm: (QWidget::resize), (QWidget::move),
+ (QWidget::internalSetGeometry):
+
2002-02-05 Kenneth Kocienda <kocienda at apple.com>
Changes to move these last bits of code to the new cache API.
@@ -229,7 +240,6 @@
src/kwq/qt/_qptrdict.h: Avoid causing problems when the relevant
defines are not defined.
->>>>>>> 1.28
2002-01-22 Richard Williamson <rjw at apple.com>
Implemented KWQDesktopWidget to represent main screen. Used by javascript.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 4261c21..03a717f 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -1286,7 +1286,8 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
if (d->m_strSelectedURL != QString::null) {
id nsview = ((IFWebView *)((QWidget *)view())->getView());
- if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
+ //if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
+ if ([nsview isKindOfClass: NSClassFromString(@"NSScrollView")])
nsview = [nsview documentView];
[nsview _resetView];
KURL clickedURL(completeURL( splitUrlTarget(d->m_strSelectedURL)));
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 4261c21..03a717f 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -1286,7 +1286,8 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
if (d->m_strSelectedURL != QString::null) {
id nsview = ((IFWebView *)((QWidget *)view())->getView());
- if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
+ //if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
+ if ([nsview isKindOfClass: NSClassFromString(@"NSScrollView")])
nsview = [nsview documentView];
[nsview _resetView];
KURL clickedURL(completeURL( splitUrlTarget(d->m_strSelectedURL)));
diff --git a/WebCore/kwq/KWQScrollView.mm b/WebCore/kwq/KWQScrollView.mm
index b760012..8acdb94 100644
--- a/WebCore/kwq/KWQScrollView.mm
+++ b/WebCore/kwq/KWQScrollView.mm
@@ -150,7 +150,13 @@ void QScrollView::addChild(QWidget* child, int x, int y)
child->move (x, y);
- thisView = getView();
+ if ([getView() isKindOfClass: NSClassFromString(@"NSScrollView")]){
+ thisView = [(NSScrollView *)getView() documentView];
+ }
+ else {
+ thisView = getView();
+ }
+
subView = child->getView();
NSRect wFrame = [subView frame];
@@ -174,22 +180,43 @@ void QScrollView::removeChild(QWidget* child)
[subView removeFromSuperview];
}
+ at interface IFWebView: NSObject
+- (QWidget *)_widget;
+- (void)setFrameSize: (NSSize)r;
+ at end
void QScrollView::resizeContents(int w, int h)
{
- resize (w, h);
+ KWQDEBUG4 ("0x%08x %s at w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
+ //if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
+ if ([getView() isKindOfClass: NSClassFromString(@"NSScrollView")]){
+ IFWebView *wview = [(NSScrollView *)getView() documentView];
+
+ KWQDEBUG4 ("0x%08x %s at w %d h %d\n", wview, [[[wview class] className] cString], w, h);
+ w -= (int)[NSScroller scrollerWidth];
+ if (w < 0)
+ w = 0;
+ // Why isn't there a scollerHeight?
+ h -= (int)[NSScroller scrollerWidth];
+ if (h < 0)
+ h = 0;
+ [wview setFrameSize: NSMakeSize (w,h)];
+ }
+ else {
+ resize (w, h);
+ }
}
void QScrollView::updateContents(int x, int y, int w, int h)
{
- _logNotYetImplemented();
+ KWQDEBUG6 ("0x%08x %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
}
void QScrollView::repaintContents(int x, int y, int w, int h, bool erase=TRUE)
{
- _logNeverImplemented();
+ KWQDEBUG6 ("0x%08x %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
}
QPoint QScrollView::contentsToViewport(const QPoint &)
diff --git a/WebCore/kwq/KWQWidget.mm b/WebCore/kwq/KWQWidget.mm
index 61da965..9e9bc21 100644
--- a/WebCore/kwq/KWQWidget.mm
+++ b/WebCore/kwq/KWQWidget.mm
@@ -116,6 +116,7 @@ QSize QWidget::sizeHint() const
void QWidget::resize(int w, int h)
{
+ KWQDEBUG4 ("0x%08x %s to w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
internalSetGeometry( pos().x(), pos().y(), w, h );
}
@@ -206,6 +207,7 @@ QPoint QWidget::pos() const
void QWidget::move(int x, int y)
{
+ KWQDEBUG4 ("0x%08x %s to x %d y %d\n", getView(), [[[getView() class] className] cString], x, y);
internalSetGeometry( x,
y,
width(), height() );
@@ -398,7 +400,14 @@ void QWidget::hide()
void QWidget::internalSetGeometry( int x, int y, int w, int h )
{
- [data->view setFrame: NSMakeRect (x, y, w, h)];
+ NSView *docview;
+
+ //if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
+ //if ([data->view isKindOfClass: NSClassFromString(@"NSScrollView")])
+ // docview = [((NSScrollView *)data->view) documentView];
+ //else
+ docview = data->view;
+ [docview setFrame: NSMakeRect (x, y, w, h)];
}
diff --git a/WebCore/src/kwq/KWQKHTMLPart.mm b/WebCore/src/kwq/KWQKHTMLPart.mm
index 4261c21..03a717f 100644
--- a/WebCore/src/kwq/KWQKHTMLPart.mm
+++ b/WebCore/src/kwq/KWQKHTMLPart.mm
@@ -1286,7 +1286,8 @@ void KHTMLPart::khtmlMouseReleaseEvent( khtml::MouseReleaseEvent *event )
if (d->m_strSelectedURL != QString::null) {
id nsview = ((IFWebView *)((QWidget *)view())->getView());
- if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
+ //if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
+ if ([nsview isKindOfClass: NSClassFromString(@"NSScrollView")])
nsview = [nsview documentView];
[nsview _resetView];
KURL clickedURL(completeURL( splitUrlTarget(d->m_strSelectedURL)));
diff --git a/WebCore/src/kwq/KWQScrollView.mm b/WebCore/src/kwq/KWQScrollView.mm
index b760012..8acdb94 100644
--- a/WebCore/src/kwq/KWQScrollView.mm
+++ b/WebCore/src/kwq/KWQScrollView.mm
@@ -150,7 +150,13 @@ void QScrollView::addChild(QWidget* child, int x, int y)
child->move (x, y);
- thisView = getView();
+ if ([getView() isKindOfClass: NSClassFromString(@"NSScrollView")]){
+ thisView = [(NSScrollView *)getView() documentView];
+ }
+ else {
+ thisView = getView();
+ }
+
subView = child->getView();
NSRect wFrame = [subView frame];
@@ -174,22 +180,43 @@ void QScrollView::removeChild(QWidget* child)
[subView removeFromSuperview];
}
+ at interface IFWebView: NSObject
+- (QWidget *)_widget;
+- (void)setFrameSize: (NSSize)r;
+ at end
void QScrollView::resizeContents(int w, int h)
{
- resize (w, h);
+ KWQDEBUG4 ("0x%08x %s at w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
+ //if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
+ if ([getView() isKindOfClass: NSClassFromString(@"NSScrollView")]){
+ IFWebView *wview = [(NSScrollView *)getView() documentView];
+
+ KWQDEBUG4 ("0x%08x %s at w %d h %d\n", wview, [[[wview class] className] cString], w, h);
+ w -= (int)[NSScroller scrollerWidth];
+ if (w < 0)
+ w = 0;
+ // Why isn't there a scollerHeight?
+ h -= (int)[NSScroller scrollerWidth];
+ if (h < 0)
+ h = 0;
+ [wview setFrameSize: NSMakeSize (w,h)];
+ }
+ else {
+ resize (w, h);
+ }
}
void QScrollView::updateContents(int x, int y, int w, int h)
{
- _logNotYetImplemented();
+ KWQDEBUG6 ("0x%08x %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
}
void QScrollView::repaintContents(int x, int y, int w, int h, bool erase=TRUE)
{
- _logNeverImplemented();
+ KWQDEBUG6 ("0x%08x %s at (%d,%d) w %d h %d\n", getView(), [[[getView() class] className] cString], x, y, w, h);
}
QPoint QScrollView::contentsToViewport(const QPoint &)
diff --git a/WebCore/src/kwq/KWQWidget.mm b/WebCore/src/kwq/KWQWidget.mm
index 61da965..9e9bc21 100644
--- a/WebCore/src/kwq/KWQWidget.mm
+++ b/WebCore/src/kwq/KWQWidget.mm
@@ -116,6 +116,7 @@ QSize QWidget::sizeHint() const
void QWidget::resize(int w, int h)
{
+ KWQDEBUG4 ("0x%08x %s to w %d h %d\n", getView(), [[[getView() class] className] cString], w, h);
internalSetGeometry( pos().x(), pos().y(), w, h );
}
@@ -206,6 +207,7 @@ QPoint QWidget::pos() const
void QWidget::move(int x, int y)
{
+ KWQDEBUG4 ("0x%08x %s to x %d y %d\n", getView(), [[[getView() class] className] cString], x, y);
internalSetGeometry( x,
y,
width(), height() );
@@ -398,7 +400,14 @@ void QWidget::hide()
void QWidget::internalSetGeometry( int x, int y, int w, int h )
{
- [data->view setFrame: NSMakeRect (x, y, w, h)];
+ NSView *docview;
+
+ //if ([nsview isKindOfClass: NSClassFromString(@"IFDynamicScrollBarsView")])
+ //if ([data->view isKindOfClass: NSClassFromString(@"NSScrollView")])
+ // docview = [((NSScrollView *)data->view) documentView];
+ //else
+ docview = data->view;
+ [docview setFrame: NSMakeRect (x, y, w, h)];
}
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e17011c..6290daf 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-05 Richard Williamson <rjw at apple.com>
+
+ Changes to support dynamic scroll bars in frames/iframes.
+
+ * WebView.subproj/IFBaseWebController.mm: (-[IFBaseWebController
+ createFrameNamed:for:inParent:]):
+ * WebView.subproj/IFWebView.mm: (-[IFWebView dataSourceChanged]):
+ * WebView.subproj/IFWebViewPrivate.mm: (-[IFWebView _setFrameScrollView:]):
+
2002-02-04 Maciej Stachowiak <mjs at apple.com>
Rename all classes from WK prefix to IF prefix.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e17011c..6290daf 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-02-05 Richard Williamson <rjw at apple.com>
+
+ Changes to support dynamic scroll bars in frames/iframes.
+
+ * WebView.subproj/IFBaseWebController.mm: (-[IFBaseWebController
+ createFrameNamed:for:inParent:]):
+ * WebView.subproj/IFWebView.mm: (-[IFWebView dataSourceChanged]):
+ * WebView.subproj/IFWebViewPrivate.mm: (-[IFWebView _setFrameScrollView:]):
+
2002-02-04 Maciej Stachowiak <mjs at apple.com>
Rename all classes from WK prefix to IF prefix.
diff --git a/WebKit/WebView.subproj/IFBaseWebController.mm b/WebKit/WebView.subproj/IFBaseWebController.mm
index a4b9585..5639446 100644
--- a/WebKit/WebView.subproj/IFBaseWebController.mm
+++ b/WebKit/WebView.subproj/IFBaseWebController.mm
@@ -137,7 +137,7 @@
IFBaseWebControllerPrivate *data = ((IFBaseWebControllerPrivate *)_controllerPrivate);
IFWebView *childView;
IFWebFrame *newFrame;
- //IFDynamicScrollBarsView *scrollView;
+ IFDynamicScrollBarsView *scrollView;
childView = [[IFWebView alloc] initWithFrame: NSMakeRect (0,0,0,0)];
@@ -150,9 +150,8 @@
[data->dataSourceMap setObject: childDataSource forKey: [IFObjectHolder holderWithObject:childView]];
[childDataSource _setController: self];
-
- //scrollView = [[[IFDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,0,0)] autorelease];
- //[childView _setFrameScrollView: scrollView];
+ scrollView = [[[IFDynamicScrollBarsView alloc] initWithFrame: NSMakeRect(0,0,0,0)] autorelease];
+ [childView _setFrameScrollView: scrollView];
[childView dataSourceChanged];
diff --git a/WebKit/WebView.subproj/IFWebView.mm b/WebKit/WebView.subproj/IFWebView.mm
index 9684709..61edfa1 100644
--- a/WebKit/WebView.subproj/IFWebView.mm
+++ b/WebKit/WebView.subproj/IFWebView.mm
@@ -66,9 +66,9 @@
part->setView (data->widget);
// Check to see if we're a frame.
- //if ([self _frameScrollView])
- // data->widget->setView ([self _frameScrollView]);
- //else
+ if ([self _frameScrollView])
+ data->widget->setView ([self _frameScrollView]);
+ else
data->widget->setView (self);
data->widget->resize (r.size.width,r.size.height);
diff --git a/WebKit/WebView.subproj/IFWebViewPrivate.mm b/WebKit/WebView.subproj/IFWebViewPrivate.mm
index 3f0b311..048fd4d 100644
--- a/WebKit/WebView.subproj/IFWebViewPrivate.mm
+++ b/WebKit/WebView.subproj/IFWebViewPrivate.mm
@@ -69,6 +69,9 @@
- (void)_setFrameScrollView: (IFDynamicScrollBarsView *)sv
{
((IFWebViewPrivate *)_viewPrivate)->frameScrollView = [sv retain];
+ //[sv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+ //[sv setHasVerticalScroller: YES];
+ //[sv setHasHorizontalScroller: YES];
[self setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[sv setDocumentView: self];
}
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 9684709..61edfa1 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -66,9 +66,9 @@
part->setView (data->widget);
// Check to see if we're a frame.
- //if ([self _frameScrollView])
- // data->widget->setView ([self _frameScrollView]);
- //else
+ if ([self _frameScrollView])
+ data->widget->setView ([self _frameScrollView]);
+ else
data->widget->setView (self);
data->widget->resize (r.size.width,r.size.height);
diff --git a/WebKit/WebView.subproj/WebFrameViewPrivate.m b/WebKit/WebView.subproj/WebFrameViewPrivate.m
index 3f0b311..048fd4d 100644
--- a/WebKit/WebView.subproj/WebFrameViewPrivate.m
+++ b/WebKit/WebView.subproj/WebFrameViewPrivate.m
@@ -69,6 +69,9 @@
- (void)_setFrameScrollView: (IFDynamicScrollBarsView *)sv
{
((IFWebViewPrivate *)_viewPrivate)->frameScrollView = [sv retain];
+ //[sv setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
+ //[sv setHasVerticalScroller: YES];
+ //[sv setHasHorizontalScroller: YES];
[self setAutoresizingMask: NSViewWidthSizable | NSViewHeightSizable];
[sv setDocumentView: self];
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list