diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-09 09:42:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-09 09:45:55 +0000 |
| commit | 110751e5415cda9ba9488a0673e956a443c836fd (patch) | |
| tree | 0eccb436f368bdaa347a49c353ad073816cbb502 /cui | |
| parent | Adapt loplugin:passstuffbyref to Clang 3.2 (diff) | |
| download | core-110751e5415cda9ba9488a0673e956a443c836fd.tar.gz core-110751e5415cda9ba9488a0673e956a443c836fd.zip | |
Related: fdo#87876 make checkbox label shorter, move warning into tooltip
Change-Id: I5f24703db70b53306d618d8fb89ad4a468d1a5f9
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 11 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optviewpage.ui | 5 |
2 files changed, 3 insertions, 13 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index eedf11a1ea63..512e8ad2c024 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -627,18 +627,7 @@ 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 1a6d95d2cbe3..d1202289a548 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -97,11 +97,12 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="forceopengl:wrap"> - <property name="label" translatable="yes">Force OpenGL even if blacklisted (might expose driver bugs)</property> + <object class="GtkCheckButton" id="forceopengl"> + <property name="label" translatable="yes">Force OpenGL even if blacklisted</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Enabling this may expose driver bugs</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> |