[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

[Caolán McNamara]

 vcl/source/window/builder.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 312ddda98c447925bd85721f361ab9a4ecba4fef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 2 20:53:13 2013 +0100

    stop annoying temp full screen windows appearing on insert->index entry
    
    Change-Id: I730617f5ce28149f79d1d22efbfb7eab22e5840d
    (cherry picked from commit 8f6b90a80c7b6e1c19422e944ca49657581e1042)
    Reviewed-on: https://gerrit.libreoffice.org/5761
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 7e5282c..fb29a2e 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1184,6 +1184,14 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
     {
         extractStock(id, rMap);
         pWindow = new FixedImage(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
+        //such parentless GtkImages are temps used to set icons on buttons
+        //default them to hidden to stop e.g. insert->index entry flicking temp
+        //full screen windows
+        if (!pParent)
+        {
+            rMap["visible"] = "false";
+        }
+
     }
     else if (name == "GtkSeparator")
     {