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

[Caolán McNamara]

 cui/source/options/treeopt.cxx   |    1 +
 cui/uiconfig/ui/optionsdialog.ui |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0546e652adadeb47997306380d427ac16ab17608
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 15 11:27:40 2015 +0000

    Related: fdo#87551 measure in approx chars and not pixels
    
    Change-Id: Ibf34083d99e0aceee2855ed10939ad3b60b8abae

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 99b7b76..fdcbb0a 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -509,6 +509,7 @@ void OfaTreeOptionsDialog::InitWidgets()
     Size aSize(pTabBox->LogicToPixel(Size(278, 259), MAP_APPFONT));
     pTabBox->set_width_request(aSize.Width());
     pTabBox->set_height_request(aSize.Height() - get_action_area()->get_preferred_size().Height());
+    pTreeLB->set_width_request(pTreeLB->approximate_char_width() * 25);
     pTreeLB->set_height_request(pTabBox->get_height_request());
 }
 
diff --git a/cui/uiconfig/ui/optionsdialog.ui b/cui/uiconfig/ui/optionsdialog.ui
index c7f338e..e40815b 100644
--- a/cui/uiconfig/ui/optionsdialog.ui
+++ b/cui/uiconfig/ui/optionsdialog.ui
@@ -26,7 +26,6 @@
             <property name="spacing">6</property>
             <child>
               <object class="svtlo-SvTreeListBox" id="pages:border">
-                <property name="width_request">240</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="vexpand">True</property>