Commit 8179556f authored by cblu's avatar cblu
Browse files

Fixed: 3025868 - Plugin context menu disappears then reappears if you click off of it

	Also fixed some rare dragging weirdness in WebHTMLView. If you attempted to drag a plug-in after dragging an image, the image would drag again.

        * Plugins.subproj/WebBaseNetscapePluginView.m:
        (-[WebBaseNetscapePluginView mouseDragged:]): subclass and do nothing to prevent calling mouseDragged in WebHTMLView
        (-[WebBaseNetscapePluginView performKeyEquivalent:]): no changes to this method, removed menuForEvent, wasn't needed after all
        * Plugins.subproj/WebNetscapePluginStream.m:
        (-[WebNetscapePluginStream stop]): minor clean-up


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2388 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent d564f422
2002-10-20 Chris Blumenberg <cblu@apple.com>
Fixed: 3025868 - Plugin context menu disappears then reappears if you click off of it
Also fixed some rare dragging weirdness in WebHTMLView. If you attempted to drag a plug-in after dragging an image, the image would drag again.
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView mouseDragged:]): subclass and do nothing to prevent calling mouseDragged in WebHTMLView
(-[WebBaseNetscapePluginView performKeyEquivalent:]): no changes to this method, removed menuForEvent, wasn't needed after all
* Plugins.subproj/WebNetscapePluginStream.m:
(-[WebNetscapePluginStream stop]): minor clean-up
2002-10-20 Darin Adler <darin@apple.com>
 
- fixed a minor problem with autorelease I just ran into
......
2002-10-20 Chris Blumenberg <cblu@apple.com>
Fixed: 3025868 - Plugin context menu disappears then reappears if you click off of it
Also fixed some rare dragging weirdness in WebHTMLView. If you attempted to drag a plug-in after dragging an image, the image would drag again.
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView mouseDragged:]): subclass and do nothing to prevent calling mouseDragged in WebHTMLView
(-[WebBaseNetscapePluginView performKeyEquivalent:]): no changes to this method, removed menuForEvent, wasn't needed after all
* Plugins.subproj/WebNetscapePluginStream.m:
(-[WebNetscapePluginStream stop]): minor clean-up
2002-10-20 Darin Adler <darin@apple.com>
 
- fixed a minor problem with autorelease I just ran into
......
......@@ -243,6 +243,11 @@ - (void)mouseExited:(NSEvent *)theEvent
[[NSCursor arrowCursor] set];
}
- (void)mouseDragged:(NSEvent *)theEvent
{
// Do nothing so that other responders don't respond to the drag that initiated in this view.
}
- (void)keyUp:(NSEvent *)theEvent
{
EventRecord event;
......@@ -332,21 +337,6 @@ - (BOOL)performKeyEquivalent:(NSEvent *)theEvent
return acceptedEvent;
}
// Must subclass menuForEvent: for right-click to work.
- (NSMenu *)menuForEvent:(NSEvent *)theEvent
{
EventRecord event;
[self getCarbonEvent:&event withEvent:theEvent];
BOOL acceptedEvent;
acceptedEvent = [self sendEvent:&event];
LOG(Plugins, "NPP_HandleEvent(menuForEvent): %d pt.v=%d, pt.h=%d", acceptedEvent, event.where.v, event.where.h);
return nil;
}
#pragma mark WEB_NETSCAPE_PLUGIN
- (void)setUpWindowAndPort
......
......@@ -73,10 +73,10 @@ - (void)stop
WebController *controller = [view controller];
WebError *cancelError = [[WebError alloc] initWithErrorCode:WebErrorCodeCancelled
inDomain:WebErrorDomainWebFoundation
failingURL:nil];
inDomain:WebErrorDomainWebFoundation
failingURL:nil];
[controller _receivedError:cancelError
forResourceHandle:resource
forResourceHandle:resource
fromDataSource:[view dataSource]];
[cancelError release];
......
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