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

[Caolán McNamara]

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |    7 +++++++
 desktop/uiconfig/ui/extensionmanager.ui          |    2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 93a0b9aac9ce55bb6d04f00bb817bb1da1566838
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jun 5 13:25:58 2013 +0100

    Related: fdo#65407 set a default size related to font size rather than pixels
    
    Change-Id: I97ff54de97ca1e02aff2a94dc01f2e4991600cd5
    (cherry picked from commit 65df76208a8ad5d7b6de22b7bcae14148271dc54)

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 2a439da..5c66a36 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -148,6 +148,8 @@ public:
     virtual void    MouseButtonDown( const MouseEvent& rMEvt );
     virtual long    Notify( NotifyEvent& rNEvt );
 
+    virtual Size    GetOptimalSize() const;
+
     virtual void    RecalcAll();
     virtual void    selectEntry( const long nPos );
     //-----------------
@@ -164,6 +166,11 @@ ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl(Window* pParent)
 {
 }
 
+Size ExtBoxWithBtns_Impl::GetOptimalSize() const
+{
+    return LogicToPixel(Size(250, 150), MapMode(MAP_APPFONT));
+}
+
 //------------------------------------------------------------------------------
 void ExtBoxWithBtns_Impl::InitFromDialog(ExtMgrDialog *pParentDialog)
 {
diff --git a/desktop/uiconfig/ui/extensionmanager.ui b/desktop/uiconfig/ui/extensionmanager.ui
index d949957..2f10a0b 100644
--- a/desktop/uiconfig/ui/extensionmanager.ui
+++ b/desktop/uiconfig/ui/extensionmanager.ui
@@ -89,8 +89,6 @@
             <property name="spacing">12</property>
             <child>
               <object class="deploymentgui-ExtBoxWithBtns" id="extensions">
-                <property name="width_request">600</property>
-                <property name="height_request">320</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
               </object>