vlc | branch: master | Erwan Tulou <[email protected]> | Tue Sep 1 14:53:12 2020 +0200| [7babcb233e5b6f05614df5b69d7f9078b8457594] | committer: Erwan Tulou
skins2(Windows): fix mouse input no longer working for skins2 Following latest change at core level, skins2 stopped reacting to mouse events. Actually, the Windows Proc was not fully configured in the case of Vout windows and returned right away as a no-op. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7babcb233e5b6f05614df5b69d7f9078b8457594 --- modules/gui/skins2/win32/win32_window.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/modules/gui/skins2/win32/win32_window.cpp b/modules/gui/skins2/win32/win32_window.cpp index 1ff49414ac..1a48609818 100644 --- a/modules/gui/skins2/win32/win32_window.cpp +++ b/modules/gui/skins2/win32/win32_window.cpp @@ -73,9 +73,6 @@ Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow, m_hWnd = CreateWindowEx( WS_EX_APPWINDOW, vlc_class, vlc_name, WS_POPUP | WS_CLIPCHILDREN, 0, 0, 0, 0, NULL, 0, hInst, NULL ); - - // Store with it a pointer to the interface thread - SetWindowLongPtr( m_hWnd, GWLP_USERDATA, (LONG_PTR)getIntf() ); } else if( type == GenericWindow::FscWindow ) { @@ -90,9 +87,6 @@ Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow, m_hWnd = CreateWindowEx( WS_EX_APPWINDOW, vlc_class, vlc_name, WS_POPUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS, 0, 0, 0, 0, m_hWnd_parent, 0, hInst, NULL ); - - // Store with it a pointer to the interface thread - SetWindowLongPtr( m_hWnd, GWLP_USERDATA, (LONG_PTR)getIntf() ); } else { @@ -101,9 +95,6 @@ Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow, m_hWnd = CreateWindowEx( 0, vlc_class, vlc_name, WS_POPUP | WS_CLIPCHILDREN, 0, 0, 0, 0, hWnd_owner, 0, hInst, NULL ); - - // Store with it a pointer to the interface thread - SetWindowLongPtr( m_hWnd, GWLP_USERDATA, (LONG_PTR)getIntf() ); } if( !m_hWnd ) @@ -112,6 +103,9 @@ Win32Window::Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow, return; } + // Store with it a pointer to the interface thread + SetWindowLongPtr( m_hWnd, GWLP_USERDATA, (LONG_PTR)getIntf() ); + // Store a pointer to the GenericWindow in a map pFactory->m_windowMap[m_hWnd] = &rWindow; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
