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

[Caolán McNamara]

 svx/uiconfig/ui/colorwindow.ui      |    6 ++++--
 svx/uiconfig/ui/floatingundoredo.ui |    1 -
 vcl/source/window/builder.cxx       |   16 +++++++++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit 39428437d5ed9893007c915175f54c21dd03f95f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 16 15:26:20 2014 +0100

    Related: fdo#84676 try to give floating windows their original stylebits
    
    as they were before becoming .ui components to see if that makes
    a difference here
    
    Change-Id: I1699e19f14b18579f6b8c973d64f069b206b7cb8

diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui
index 0cbeaad..66ac451 100644
--- a/svx/uiconfig/ui/colorwindow.ui
+++ b/svx/uiconfig/ui/colorwindow.ui
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.16.1 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
-  <requires lib="LibreOffice" version="1.0"/>
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkWindow" id="palette_popup_window">
+    <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
@@ -12,6 +13,7 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">popup-menu</property>
     <property name="skip_pager_hint">True</property>
+    <property name="decorated">False</property>
     <property name="deletable">False</property>
     <child>
       <object class="GtkBox" id="box1">
diff --git a/svx/uiconfig/ui/floatingundoredo.ui b/svx/uiconfig/ui/floatingundoredo.ui
index 66f30a6..2c48f82 100644
--- a/svx/uiconfig/ui/floatingundoredo.ui
+++ b/svx/uiconfig/ui/floatingundoredo.ui
@@ -11,7 +11,6 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">popup-menu</property>
     <property name="skip_pager_hint">True</property>
-    <property name="decorated">False</property>
     <property name="deletable">False</property>
     <child>
       <object class="GtkBox" id="box">
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index faffecc..4f7202f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -604,6 +604,18 @@ namespace
         return bResizable;
     }
 
+    bool extractDecorated(VclBuilder::stringmap &rMap)
+    {
+        bool bDecorated = true;
+        VclBuilder::stringmap::iterator aFind = rMap.find(OString("decorated"));
+        if (aFind != rMap.end())
+        {
+            bDecorated = toBool(aFind->second);
+            rMap.erase(aFind);
+        }
+        return bDecorated;
+    }
+
     bool extractCloseable(VclBuilder::stringmap &rMap)
     {
         bool bCloseable = true;
@@ -973,11 +985,13 @@ namespace
         OString sBorder = VclBuilder::extractCustomProperty(rMap);
         if (!sBorder.isEmpty())
             nBits |= WB_BORDER;
+        if (!extractDecorated(rMap))
+            nBits |= WB_OWNERDRAWDECORATION;
         OString sType(extractTypeHint(rMap));
         if (sType == "utility")
             nBits |= WB_SYSTEMWINDOW | WB_DIALOGCONTROL | WB_MOVEABLE;
         else if (sType == "popup-menu")
-            nBits |= WB_SYSTEMWINDOW | WB_DIALOGCONTROL | WB_POPUP | WB_OWNERDRAWDECORATION;
+            nBits |= WB_SYSTEMWINDOW | WB_DIALOGCONTROL | WB_POPUP;
         else
             nBits |= WB_MOVEABLE;
         return nBits;