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

[Caolán McNamara]

 formula/source/ui/dlg/formula.cxx    |    5 +++++
 formula/uiconfig/ui/formuladialog.ui |    1 +
 2 files changed, 6 insertions(+)

New commits:
commit 73e4a5d091de89064c931128da46a910cc139bc3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 17 21:03:46 2014 +0100

    give refedit in formula wizard an initial size
    
    Change-Id: I8e19c29c47dea2f7cff754e81ef51fc9898fdee8

diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index f5402ba..9f923ba 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -1402,8 +1402,13 @@ void FormulaDlg_Impl::UpdateSelection()
     pMEdit->SetSelection(aSel);
     m_pMEFormula->UpdateOldSel();
 }
+
 ::std::pair<RefButton*,RefEdit*> FormulaDlg_Impl::RefInputStartBefore( RefEdit* pEdit, RefButton* pButton )
 {
+    //because its initially hidden, give it its optimal
+    //size so clicking the refbutton has an initial
+    //size to work work when retro-fitting this to .ui
+    m_pEdRef->SetSizePixel(m_pEdRef->GetOptimalSize());
     m_pEdRef->Show();
     pTheRefEdit = pEdit;
     pTheRefButton = pButton;
diff --git a/formula/uiconfig/ui/formuladialog.ui b/formula/uiconfig/ui/formuladialog.ui
index 7afd500..b947b3d 100644
--- a/formula/uiconfig/ui/formuladialog.ui
+++ b/formula/uiconfig/ui/formuladialog.ui
@@ -440,6 +440,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
+                    <property name="width_chars">60</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>