npapi-vlc | branch: master | Felix Paul Kühne <[email protected]> | Mon Feb 9 22:57:35 2015 +0100| [ce43239c24da83e03c0ced0edb6a98ceafe0e08b] | committer: Felix Paul Kühne
mac plugin: hide toolbar after going fullscreen > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=ce43239c24da83e03c0ced0edb6a98ceafe0e08b --- npapi/vlcplugin_mac.mm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/npapi/vlcplugin_mac.mm b/npapi/vlcplugin_mac.mm index a18ffc7..ed4c317 100644 --- a/npapi/vlcplugin_mac.mm +++ b/npapi/vlcplugin_mac.mm @@ -115,6 +115,8 @@ CGImageRef createImageNamed(NSString *); } @property (readwrite) VlcPluginMac * cppPlugin; +- (void)hideToolbar; + @end @interface VLCFullscreenWindow : NSWindow { @@ -204,6 +206,8 @@ void VlcPluginMac::toggle_fullscreen() [[(VLCPerInstanceStorage *)this->_perInstanceStorage fullscreenView].layer setNeedsDisplay]; [[(VLCPerInstanceStorage *)this->_perInstanceStorage fullscreenWindow].contentView enterFullScreenMode: [NSScreen mainScreen] withOptions: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithInt: 0], NSFullScreenModeAllScreens, nil]]; + + [[(VLCPerInstanceStorage *)this->_perInstanceStorage fullscreenView] performSelector:@selector(hideToolbar) withObject:nil afterDelay: 4.1]; } else { if (![(VLCPerInstanceStorage *)this->_perInstanceStorage fullscreenWindow]) return; @@ -1023,7 +1027,7 @@ bool VlcPluginMac::handle_event(void *event) { self.cppPlugin->set_toolbar_visible(true); _timeSinceLastMouseMove = [NSDate timeIntervalSinceReferenceDate]; - [self performSelector:@selector(hideToolbar) withObject:nil afterDelay: 4.1]; + [self performSelector:@selector(_hideToolbar) withObject:nil afterDelay: 4.1]; if ([(VLCPerInstanceStorage *)_cppPlugin->_perInstanceStorage playbackLayer] != nil) { if ([[(VLCPerInstanceStorage *)_cppPlugin->_perInstanceStorage playbackLayer] respondsToSelector:@selector(mouseMovedToX:Y:)]) { @@ -1035,12 +1039,16 @@ bool VlcPluginMac::handle_event(void *event) [super mouseMoved: theEvent]; } +- (void)_hideToolbar +{ + if ([NSDate timeIntervalSinceReferenceDate] - _timeSinceLastMouseMove >= 4) + [self hideToolbar]; +} + - (void)hideToolbar { - if ([NSDate timeIntervalSinceReferenceDate] - _timeSinceLastMouseMove >= 4) { - self.cppPlugin->set_toolbar_visible(false); - [NSCursor setHiddenUntilMouseMoves:YES]; - } + self.cppPlugin->set_toolbar_visible(false); + [NSCursor setHiddenUntilMouseMoves:YES]; } @end _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
