summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-09 09:36:16 +0000
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-02-09 10:52:50 +0000
commit27b5c708938167e7516407db7d22bf48aac796b2 (patch)
tree49f5d1598f61d0ad36a4a048c3e2d99e4c96af80
parent3c1c50281acce8a7471ba456d514e2584e6d22d1 (diff)
Resolves: fdo#87876 full text of war and peace used as checkbox label
Change-Id: I016975123c0f277b4e4c8c8097e89fd84d93530a (cherry picked from commit 081f3c0f70a9aa4d9f1f72bfbdb838bbd2dc993e) Reviewed-on: https://gerrit.libreoffice.org/14379 Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--cui/source/options/optgdlg.cxx11
-rw-r--r--cui/uiconfig/ui/optviewpage.ui2
2 files changed, 12 insertions, 1 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 842e453d1571..d1ac60341bcb 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -661,7 +661,18 @@ OfaViewTabPage::OfaViewTabPage(vcl::Window* pParent, const SfxItemSet& rSet)
get(m_pUseHardwareAccell, "useaccel");
get(m_pUseAntiAliase, "useaa");
get(m_pUseOpenGL, "useopengl");
+
get(m_pForceOpenGL, "forceopengl");
+ //fdo#87876 , 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(40*approximate_char_width()));
+ if (aPrefSize.Width() > aSize.Width())
+ {
+ m_pForceOpenGL->set_width_request(aSize.Width());
+ m_pForceOpenGL->set_height_request(aSize.Height());
+ }
+
get(m_pMousePosLB, "mousepos");
get(m_pMouseMiddleLB, "mousemiddle");
// #i97672#
diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui
index 9536667a2450..4ff3d61da9c1 100644
--- a/cui/uiconfig/ui/optviewpage.ui
+++ b/cui/uiconfig/ui/optviewpage.ui
@@ -97,7 +97,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 (might expose driver bugs)</property>
<property name="visible">True</property>
<property name="can_focus">True</property>