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

[Joren De Cuyper]

 vcl/source/window/builder.cxx  |   11 ++++++++++-
 vcl/uiconfig/ui/printdialog.ui |    3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit f10ba07935951e6c74663a35de9a79b7d66beb37
Author: Joren De Cuyper <joren.libreoff...@telenet.be>
Date:   Fri Feb 8 14:34:02 2013 +0100

    resolve fdo#60450 - Printer list is missing its border in Print dialog
    
    Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5
    Reviewed-on: https://gerrit.libreoffice.org/2043
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 98091a3..7ea7a85 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1031,7 +1031,16 @@ Window *VclBuilder::makeObject(Window *pParent, const 
OString &name, const OStri
         //   everything over to SvTreeViewBox
         //d) remove the users of makeSvTreeViewBox
         extractModel(id, rMap);
-        WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
+        WinBits nWinStyle;
+        OString sBorder = extractCustomProperty(rMap);
+        if (sBorder.isEmpty())
+        {
+            nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE;
+        }
+        else
+        {
+            nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_SIMPLEMODE|WB_BORDER;
+        }
         //ListBox manages its own scrolling,
         Window *pRealParent = prepareWidgetOwnScrolling(pParent, nWinStyle);
         pWindow = new ListBox(pRealParent, nWinStyle);
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 22e759c..731d4c0 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -339,7 +339,7 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkTreeView" id="printers">
+                                  <object class="GtkTreeView" 
id="printers:border">
                                     <property 
name="height_request">100</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
@@ -362,6 +362,7 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="margin_top">6</property>
                             <property name="label" 
translatable="yes">Printer</property>
                             <attributes>
                               <attribute name="weight" value="bold"/>

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits