summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cocoa/BrowserView.m13
-rw-r--r--cocoa/BrowserWindowController.m2
2 files changed, 12 insertions, 3 deletions
diff --git a/cocoa/BrowserView.m b/cocoa/BrowserView.m
index 990f42732..5f4d9a216 100644
--- a/cocoa/BrowserView.m
+++ b/cocoa/BrowserView.m
@@ -165,10 +165,19 @@ static inline NSRect cocoa_get_caret_rect( BrowserView *view )
return YES;
}
+- (void) viewDidMoveToWindow;
+{
+ NSTrackingArea *area = [[NSTrackingArea alloc] initWithRect: [self visibleRect]
+ options: NSTrackingMouseMoved | NSTrackingActiveInKeyWindow | NSTrackingInVisibleRect
+ owner: self
+ userInfo: nil];
+ [self addTrackingArea: area];
+ [area release];
+}
+
static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
{
browser_mouse_state result = 0;
-
NSUInteger flags = [evt modifierFlags];
if (flags & NSShiftKeyMask) result |= BROWSER_MOUSE_MOD_1;
@@ -251,6 +260,8 @@ static browser_mouse_state cocoa_mouse_flags_for_event( NSEvent *evt )
- (void) mouseMoved: (NSEvent *)theEvent;
{
+ if (historyVisible) return;
+
NSPoint location = [self convertMousePoint: theEvent];
browser_window_mouse_track( browser, cocoa_mouse_flags_for_event( theEvent ), location.x, location.y );
diff --git a/cocoa/BrowserWindowController.m b/cocoa/BrowserWindowController.m
index a0c59594a..9fa502429 100644
--- a/cocoa/BrowserWindowController.m
+++ b/cocoa/BrowserWindowController.m
@@ -74,8 +74,6 @@
[b setTarget: self];
[b setAction: @selector(newTab:)];
- [[self window] setAcceptsMouseMovedEvents: YES];
-
[urlField setRefreshAction: @selector(reloadPage:)];
[urlField bind: @"favicon" toObject: activeBrowserController withKeyPath: @"selection.favicon" options: nil];