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

[Caolán McNamara]

 vcl/source/window/floatwin.cxx |    4 ----
 vcl/source/window/winproc.cxx  |    8 --------
 2 files changed, 12 deletions(-)

New commits:
commit c4bae028efbd32c8938c3a6051d58c1f202d5b8a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat May 23 09:21:50 2015 +0100

    Resolves: tdf#90155 don't hide+show window before initial show completes
    
    Change-Id: I16f6fb4ef025f2e464ca581fc348e8dd18981285

diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index f9abdf6..468d8cc 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -637,10 +637,6 @@ void FloatingWindow::SetTitleType( FloatWinTitleType nTitle )
 
 void FloatingWindow::StartPopupMode( const Rectangle& rRect, FloatWinPopupFlags nFlags )
 {
-    // avoid flickering
-    if ( IsVisible() )
-        Show( false, ShowFlags::NoFocusChange );
-
     if ( IsRollUp() )
         RollDown();
 
commit 768d445c1fd8a104a6c5e80ce93af99860ec6dc7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri May 22 17:30:44 2015 +0100

    gtk3: why close popups when losing focus
    
    I don't see why we want to do this, and it causes trouble with the gtk3 vclplug
    and the undo popup and color popup where gtk is giving us a "losing focus"
    signal even though those windows have the "don't ask for input focus" bit set.
    
    Change-Id: I500ca253cc43c35dda55ee0301fdcaafbd212e2d

diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index ff1252b..493147f 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1912,14 +1912,6 @@ static void ImplHandleLoseFocus( vcl::Window* pWindow )
             pSVData->maWinData.mpTrackWin->EndTracking( TrackingEventFlags::Cancel );
     }
 
-    // here we always terminate the popupmode, also when NOFOCUSCLOSE
-    // is set, such that we do not show windows during the switch
-    if ( pSVData->maWinData.mpFirstFloat )
-    {
-        if ( !(pSVData->maWinData.mpFirstFloat->GetPopupModeFlags() & FloatWinPopupFlags::NoAppFocusClose) )
-            pSVData->maWinData.mpFirstFloat->EndPopupMode( FloatWinPopupEndFlags::Cancel | FloatWinPopupEndFlags::CloseAll );
-    }
-
     pWindow->ImplGetWindowImpl()->mpFrameData->mbHasFocus = false;
 
     // execute Focus-Events after a delay, such that SystemChildWindows