vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sat Dec 1 15:45:39 2018 +0200| [4836f528e2a0a9504919e866fd3f36a3b24621a1] | committer: Rémi Denis-Courmont
window: remove unused hide mouse event > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4836f528e2a0a9504919e866fd3f36a3b24621a1 --- include/vlc_vout_window.h | 1 - modules/gui/macosx/VLCVideoOutputProvider.h | 2 -- modules/gui/macosx/VLCVideoOutputProvider.m | 24 ------------------------ 3 files changed, 27 deletions(-) diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h index 00977d9bb2..55ed516c2a 100644 --- a/include/vlc_vout_window.h +++ b/include/vlc_vout_window.h @@ -63,7 +63,6 @@ enum vout_window_control { VOUT_WINDOW_SET_SIZE, /* unsigned i_width, unsigned i_height */ VOUT_WINDOW_SET_FULLSCREEN, /* void */ VOUT_WINDOW_UNSET_FULLSCREEN, /* void */ - VOUT_WINDOW_HIDE_MOUSE VLC_DEPRECATED_ENUM, }; /** diff --git a/modules/gui/macosx/VLCVideoOutputProvider.h b/modules/gui/macosx/VLCVideoOutputProvider.h index 63fa57ec0b..0a6e100d70 100644 --- a/modules/gui/macosx/VLCVideoOutputProvider.h +++ b/modules/gui/macosx/VLCVideoOutputProvider.h @@ -46,6 +46,4 @@ - (void)updateWindowLevelForHelperWindows:(NSInteger)i_level; -- (void)hideMouseForWindow:(vout_window_t *)p_wnd; - @end diff --git a/modules/gui/macosx/VLCVideoOutputProvider.m b/modules/gui/macosx/VLCVideoOutputProvider.m index 8597559ce3..4837c2ac4e 100644 --- a/modules/gui/macosx/VLCVideoOutputProvider.m +++ b/modules/gui/macosx/VLCVideoOutputProvider.m @@ -141,11 +141,6 @@ static int WindowControl(vout_window_t *p_wnd, int i_query, va_list args) break; } - case VOUT_WINDOW_HIDE_MOUSE: - { - [voutProvider hideMouseForWindow:p_wnd]; - break; - } default: { msg_Warn(p_wnd, "unsupported control query: %i", i_query ); @@ -214,25 +209,6 @@ void WindowClose(vout_window_t *p_wnd) } #pragma mark - -#pragma mark Mouse hiding - -- (void)hideMouseForWindow:(vout_window_t *)p_wnd -{ - VLCVideoWindowCommon *o_current_window = nil; - if (p_wnd) - o_current_window = [voutWindows objectForKey:[NSValue valueWithPointer:p_wnd]]; - - if (o_current_window == nil) - return; - - if (NSPointInRect([o_current_window mouseLocationOutsideOfEventStream], - [[o_current_window videoView] convertRect:[[o_current_window videoView] bounds] - toView:nil])) { - [NSCursor setHiddenUntilMouseMoves:YES]; - } -} - -#pragma mark - #pragma mark Methods for vout provider - (VLCVoutView *)setupVoutForWindow:(vout_window_t *)p_wnd withProposedVideoViewPosition:(NSRect)videoViewPosition _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits