[Libreoffice-commits] .: 2 commits - sw/uiconfig vcl/source

[Caolán McNamara]

 sw/uiconfig/swriter/ui/titlepage.ui |    5 +++--
 vcl/source/window/dialog.cxx        |    3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit beae3cd6194e01a966710dfe4d0b5d2209d191cb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Feb 2 10:51:49 2013 +0000

    HIG visually seperate buttons from contents
    
    + add 6 vertial pixels between page properties header label and frame
    contents
    
    Change-Id: I5d28eba11757bdf690367ea5d4aa74422ca64912

diff --git a/sw/uiconfig/swriter/ui/titlepage.ui b/sw/uiconfig/swriter/ui/titlepage.ui
index d5509f2..ff40c75 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -17,7 +17,7 @@
       <object class="GtkBox" id="dialog-vbox1">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
+        <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="can_focus">False</property>
@@ -78,7 +78,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">10</property>
+            <property name="spacing">12</property>
             <child>
               <object class="GtkFrame" id="frame1">
                 <property name="visible">True</property>
@@ -457,6 +457,7 @@
                   <object class="GtkAlignment" id="alignment3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkBox" id="box2">
commit 3fb9a28b240882729898f88f92adfe3b4c4433e6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Feb 2 10:51:25 2013 +0000

    add theme content_area_spacing to dialog vbox spacing, not override
    
    Change-Id: I4b7fa3fd01717105af194a04b73d90e0d602028a

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1aef3e6..63ea451 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -670,7 +670,8 @@ void Dialog::setInitialLayoutSize()
     const DialogStyle& rDialogStyle =
         GetSettings().GetStyleSettings().GetDialogStyle();
     pBox->set_border_width(rDialogStyle.content_area_border);
-    pBox->set_spacing(rDialogStyle.content_area_spacing);
+    pBox->set_spacing(pBox->get_spacing() +
+        rDialogStyle.content_area_spacing);
 
     VclButtonBox *pActionArea = getActionArea(this);
     if (pActionArea)