diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2020-03-25 11:17:09 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2020-03-25 14:32:17 +0100 |
commit | 208bb103d3ad93c2356c60174a49204a3e919f74 (patch) | |
tree | 3cb7391d9af385079cae8e96a8e17650f31e3079 /cui | |
parent | cf05c579411a92e44d4559de2dc3a6de29412ad4 (diff) |
no reason for the FontAntiAliasing setting being UNX-only (tdf#107744)
This dates back to the ancient times where no revision control history
dares, so no idea why this was so, but it doesn't make sense, as
at least Windows can disable AA for fonts too. And if some platform
really wants to hide the setting, it should be enough just to hide
the UI element, no reason for '#if defined( UNX )' all over the place.
Change-Id: I76fc9ad157358321904573079ace5a3fe556f86a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91041
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/options/optgdlg.cxx | 18 | ||||
-rw-r--r-- | cui/source/options/optgdlg.hxx | 2 |
2 files changed, 0 insertions, 20 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index d99f3530e161..50fdda97d17b 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -802,15 +802,7 @@ OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, weld::DialogController* p m_xMenuIconBox->hide(); } -#if defined( UNX ) m_xFontAntiAliasing->connect_toggled( LINK( this, OfaViewTabPage, OnAntialiasingToggled ) ); -#else - // on this platform, we do not have the anti aliasing options - m_xFontAntiAliasing->hide(); - m_xAAPointLimitLabel->hide(); - m_xAAPointLimit->hide(); - -#endif m_xForceOpenGL->connect_toggled(LINK(this, OfaViewTabPage, OnForceOpenGLToggled)); m_xForceSkia->connect_toggled(LINK(this, OfaViewTabPage, OnForceSkiaToggled)); @@ -860,7 +852,6 @@ OfaViewTabPage::~OfaViewTabPage() { } -#if defined( UNX ) IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, weld::ToggleButton&, void ) { bool bAAEnabled = m_xFontAntiAliasing->get_active(); @@ -868,7 +859,6 @@ IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, weld::ToggleButton&, voi m_xAAPointLimitLabel->set_sensitive(bAAEnabled); m_xAAPointLimit->set_sensitive(bAAEnabled); } -#endif IMPL_LINK_NOARG(OfaViewTabPage, OnForceOpenGLToggled, weld::ToggleButton&, void) { @@ -994,7 +984,6 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) bAppearanceChanged = true; } -#if defined( UNX ) if (m_xFontAntiAliasing->get_state_changed_from_saved()) { pAppearanceCfg->SetFontAntiAliasing(m_xFontAntiAliasing->get_active()); @@ -1006,7 +995,6 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) pAppearanceCfg->SetFontAntialiasingMinPixelHeight(m_xAAPointLimit->get_value(FieldUnit::PIXEL)); bAppearanceChanged = true; } -#endif if (m_xFontShowCB->get_state_changed_from_saved()) { @@ -1180,10 +1168,8 @@ void OfaViewTabPage::Reset( const SfxItemSet* ) m_xMouseMiddleLB->set_active(static_cast<short>(pAppearanceCfg->GetMiddleMouseButton())); m_xMouseMiddleLB->save_value(); -#if defined( UNX ) m_xFontAntiAliasing->set_active( pAppearanceCfg->IsFontAntiAliasing() ); m_xAAPointLimit->set_value(pAppearanceCfg->GetFontAntialiasingMinPixelHeight(), FieldUnit::PIXEL); -#endif // WorkingSet SvtFontOptions aFontOpt; @@ -1231,10 +1217,8 @@ void OfaViewTabPage::Reset( const SfxItemSet* ) m_xForceSkia->set_active(mpSkiaConfig->forceSkia()); m_xForceSkiaRaster->set_active(mpSkiaConfig->forceSkiaRaster()); -#if defined( UNX ) m_xFontAntiAliasing->save_state(); m_xAAPointLimit->save_value(); -#endif m_xFontShowCB->save_state(); m_xUseOpenGL->save_state(); @@ -1243,9 +1227,7 @@ void OfaViewTabPage::Reset( const SfxItemSet* ) m_xForceSkia->save_state(); m_xForceSkiaRaster->save_state(); -#if defined( UNX ) OnAntialiasingToggled(*m_xFontAntiAliasing); -#endif } void OfaViewTabPage::UpdateOGLStatus() diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 04988f8e57a4..08eb2eab73b1 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -127,9 +127,7 @@ private: std::unique_ptr<weld::ComboBox> m_xMousePosLB; std::unique_ptr<weld::ComboBox> m_xMouseMiddleLB; -#if defined( UNX ) DECL_LINK(OnAntialiasingToggled, weld::ToggleButton&, void); -#endif DECL_LINK(OnForceOpenGLToggled, weld::ToggleButton&, void); DECL_LINK(OnForceSkiaToggled, weld::ToggleButton&, void); DECL_LINK(OnForceSkiaRasterToggled, weld::ToggleButton&, void); |