[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - cui/source cui/uiconfig

[Caolán McNamara]

 cui/source/options/optgdlg.cxx |   12 ++++++++++++
 cui/uiconfig/ui/optviewpage.ui |    2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 89b7c4b634a4da90d110c125ad0182ea57e1a46a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 2 20:49:10 2016 +0100

    Resolves: tdf#101196 line wrap very long checkbox content
    
    Change-Id: Ie451b88240f755a0d64dd3db14d7981b8ed2a2a2
    (cherry picked from commit 1c33b3f5f693d432f74c795a87f87bd487b09d47)
    Reviewed-on: https://gerrit.libreoffice.org/27811
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b05ca35..145b50f 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -643,6 +643,18 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
         m_pOpenGLStatusEnabled->Hide();
         m_pOpenGLStatusDisabled->Hide();
     }
+    else
+    {
+        //tdf#191196, we need height-for-width support here, but for now we can
+        //bodge it
+        Size aPrefSize(m_pForceOpenGL->get_preferred_size());
+        Size aSize(m_pForceOpenGL->CalcMinimumSize(36*approximate_char_width()));
+        if (aPrefSize.Width() > aSize.Width())
+        {
+            m_pForceOpenGL->set_width_request(aSize.Width());
+            m_pForceOpenGL->set_height_request(aSize.Height());
+        }
+    }
 
 #if defined( UNX )
     m_pFontAntiAliasing->SetToggleHdl( LINK( this, OfaViewTabPage, OnAntialiasingToggled ) );
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index c6b899a..396ddb1 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -90,7 +90,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="forceopengl">
+                      <object class="GtkCheckButton" id="forceopengl:wrap">
                         <property name="label" translatable="yes">Force OpenGL even if blacklisted (on restart)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>