vlc/vlc-2.0 | branch: master | Erwan Tulou <erwa...@videolan.org> | Thu Mar 22 18:51:16 2012 +0100| [87b30c3c704f0683c85c8e4af670f4b98d8c5a35] | committer: Jean-Baptiste Kempf
skins2: key handling (cosmetics) (cherry picked from commit 1a64a930b2974f80d7a43cba12f8bbf50718d1c0) Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=87b30c3c704f0683c85c8e4af670f4b98d8c5a35 --- modules/gui/skins2/src/top_window.cpp | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/modules/gui/skins2/src/top_window.cpp b/modules/gui/skins2/src/top_window.cpp index 6eb639a..766a253 100644 --- a/modules/gui/skins2/src/top_window.cpp +++ b/modules/gui/skins2/src/top_window.cpp @@ -159,28 +159,24 @@ void TopWindow::processEvent( EvtMouse &rEvtMouse ) // Raise the window m_rWindowManager.raise( *this ); - if( pNewHitControl && pNewHitControl->isFocusable() ) + if( m_pFocusControl != pNewHitControl ) { - // If a new control gains the focus, the previous one loses it - if( m_pFocusControl && m_pFocusControl != pNewHitControl ) + if( m_pFocusControl ) { + // The previous control loses the focus EvtFocus evt( getIntf(), false ); m_pFocusControl->handleEvent( evt ); + m_pFocusControl = NULL; } - if( pNewHitControl != m_pFocusControl ) + + if( pNewHitControl && pNewHitControl->isFocusable() ) { + // The hit control gains the focus m_pFocusControl = pNewHitControl; EvtFocus evt( getIntf(), true ); pNewHitControl->handleEvent( evt ); } } - else if( m_pFocusControl ) - { - // The previous control loses the focus - EvtFocus evt( getIntf(), false ); - m_pFocusControl->handleEvent( evt ); - m_pFocusControl = NULL; - } } // Send a mouse event to the hit control, or to the control _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
