diff options
| author | Tor Lillqvist <tml@collabora.com> | 2019-03-14 15:38:56 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2019-03-14 16:07:08 +0200 |
| commit | 4fe72e0fa13dc6032739c9e8493ef24eb5537ea3 (patch) | |
| tree | 5ba24741b7bfdbe875764b8160afee280e47e480 /cui | |
| parent | e21979195fc08d2ca1a0736deb986429e12c49aa (diff) | |
Hide the font preview on iOS
There are enough problems making the dialogs look and work sanely in
the iOS app without the preview being placed completely wrongly and
covering other controls.
Note that I am not actually able to test this here in the master
branch, as the iOS app does not work when built from the master branch
of the online repo (and this master branch of core). The corresponding
change to the cp-6.0 branch of core did work as expected (with the
online bits of the app built from the collabora-online-4 branch).
Change-Id: I383ae6b1fcacb41b20f97e17436aa26531e13c69
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index b260ed85db00..317327e12a07 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -251,7 +251,9 @@ SvxCharNamePage::SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rInSet , m_xCTLFontFeaturesButton(m_xBuilder->weld_button("ctl_features_button")) { m_xPreviewWin.reset(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin)); - +#ifdef IOS + m_xPreviewWin->hide(); +#endif m_pImpl->m_aNoStyleText = CuiResId( RID_SVXSTR_CHARNAME_NOSTYLE ); SvtLanguageOptions aLanguageOptions; @@ -1358,6 +1360,9 @@ SvxCharEffectsPage::SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& , m_xA11yWarningFT(m_xBuilder->weld_label("a11ywarning")) { m_xPreviewWin.reset(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin)); +#ifdef IOS + m_xPreviewWin->hide(); +#endif m_xFontColorLB->SetSlotId(SID_ATTR_CHAR_COLOR); m_xOverlineColorLB->SetSlotId(SID_ATTR_CHAR_COLOR); m_xUnderlineColorLB->SetSlotId(SID_ATTR_CHAR_COLOR); @@ -2479,6 +2484,9 @@ SvxCharPositionPage::SvxCharPositionPage(TabPageParent pParent, const SfxItemSet , m_xPairKerningBtn(m_xBuilder->weld_check_button("pairkerning")) { m_xPreviewWin.reset(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin)); +#ifdef IOS + m_xPreviewWin->hide(); +#endif Initialize(); } @@ -3073,6 +3081,9 @@ SvxCharTwoLinesPage::SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet m_xEndBracketLB->append(OUString::number(TWOLINE_CLOSE[i].second), CuiResId(TWOLINE_CLOSE[i].first)); m_xPreviewWin.reset(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin)); +#ifdef IOS + m_xPreviewWin->hide(); +#endif Initialize(); } |