diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-08-02 20:49:10 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-08-02 20:49:49 +0100 |
| commit | 1c33b3f5f693d432f74c795a87f87bd487b09d47 (patch) | |
| tree | 360204c7ceb75f734754e6976edf2465f072e06d /cui | |
| parent | c86e89c5bb040786193f7b8bba8516ffa706a14a (diff) | |
Resolves: tdf#101196 line wrap very long checkbox content
Change-Id: Ie451b88240f755a0d64dd3db14d7981b8ed2a2a2
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 12 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optviewpage.ui | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 1f6019fc98ba..fb7aa5846724 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -644,6 +644,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 deca7251f5a9..a59758f3761e 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> |