Commit 4dc4e198 authored by darin's avatar darin
Browse files

Reviewed by Dave.

	- fixed 3128651 -- REGRESSION: Mouse wheeling is busted on frames pages

        * WebView.subproj/WebHTMLViewPrivate.m: (-[WebHTMLView hitTest:]):
	Only do the hitTest magic for left mouse downs; the rest of the clicks end up going
	to the correct view anyway, without our help. This makes this stop making trouble for
	the scroll wheel events.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3065 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent fcdd4691
2002-12-15 Darin Adler <darin@apple.com>
Reviewed by Dave.
- fixed 3128651 -- REGRESSION: Mouse wheeling is busted on frames pages
* WebView.subproj/WebHTMLViewPrivate.m: (-[WebHTMLView hitTest:]):
Only do the hitTest magic for left mouse downs; the rest of the clicks end up going
to the correct view anyway, without our help. This makes this stop making trouble for
the scroll wheel events.
2002-12-14 Don Melton <gramps@apple.com>
Fixed 3127173 -- REGRESSION: fboweb.com renders incorrectly
......
......@@ -24,7 +24,7 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
static BOOL doRealHitTest = NO;
static BOOL forceRealHitTest = NO;
@interface NSView (AppKitSecretsIKnowAbout)
- (void)_recursiveDisplayRectIfNeededIgnoringOpacity:(NSRect)rect isVisibleRect:(BOOL)isVisibleRect rectIsVisibleRectForView:(NSView *)visibleView topView:(BOOL)topView;
......@@ -271,21 +271,18 @@ - (void)scrollPoint:(NSPoint)point
- (NSView *)hitTest:(NSPoint)point
{
// Keep real hitTest: available for use below.
if (doRealHitTest) {
return [super hitTest:point];
}
// WebHTMLView objects handle all clicks for objects inside them.
return [[self superview] mouse:point inRect:[self frame]] ? self : nil;
BOOL realHitTest = forceRealHitTest || [[[self window] currentEvent] type] != NSLeftMouseDown;
return realHitTest ? [super hitTest:point] : [[self superview] mouse:point inRect:[self frame]] ? self : nil;
}
- (void)_updateMouseoverWithEvent:(NSEvent *)event
{
WebHTMLView *view = nil;
if ([event window] == [self window]) {
doRealHitTest = YES;
forceRealHitTest = YES;
NSView *hitView = [[[self window] contentView] hitTest:[event locationInWindow]];
doRealHitTest = NO;
forceRealHitTest = NO;
while (hitView) {
if ([hitView isKindOfClass:[WebHTMLView class]]) {
view = (WebHTMLView *)hitView;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment