[Libreoffice-commits] core.git: 2 commits - avmedia/source slideshow/source

[Zolnai Tamás]

 avmedia/source/opengl/oglwindow.cxx               |    4 ++++
 slideshow/source/engine/shapes/viewmediashape.cxx |    1 +
 2 files changed, 5 insertions(+)

New commits:
commit 821c42b10a7095124a9afbbba3f9bc687ace40e6
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri May 16 19:53:17 2014 +0200

    OGLWindow: fix key capturing issue
    
    Sometimes the event handler parent captures the mouse
    moce which should grab the focus for key event handling.
    
    Change-Id: Ida1022968543059154de824fc3d026c5cecba7b3

diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index 90e32ed..ec21651 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -292,6 +292,10 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent*, pEvent)
     }
     else if( pEvent->GetId() == VCLEVENT_WINDOW_MOUSEMOVE )
     {
+        if ( !m_pEventHandler->HasFocus() )
+        {
+            m_pEventHandler->GrabFocus();
+        }
         MouseEvent* pMouseEvt = (MouseEvent*)pEvent->GetData();
         if(pMouseEvt && pMouseEvt->IsLeft())
         {
commit 9199616e9d6bd04e60a5135df3b2ba7113a5f436
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri May 16 19:50:52 2014 +0200

    slideshow/glTF: make sure parent window does not cover the OpenGL window
    
    Change-Id: I0da3978cefeb3d145f7411cc1c83a87d981cac62

diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index ab97235..f91be0b 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -476,6 +476,7 @@ namespace slideshow
                                 mpEventHandlerParent.reset(new Window(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL));
                                 mpEventHandlerParent->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ),
                                                            Size( aAWTRect.Width, aAWTRect.Height ) );
+                                mpEventHandlerParent->EnablePaint(false);
                                 mpEventHandlerParent->Show();
                                 SystemWindowData aWinData = OpenGLContext::generateWinData(mpEventHandlerParent.get());
                                 mpMediaWindow.reset(new SystemChildWindow(mpEventHandlerParent.get(), 0, &aWinData));