cui/source/tabpages/chardlg.cxx | 12 ++++++++++++
vcl/ios/iosinst.cxx | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 96dce784c7971f22dcf44b66a242c22b455e32a3
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Thu Mar 14 00:31:33 2019 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Thu Mar 14 00:32:10 2019 +0200
Use smaller default font on iOS (in practice used for dialogs in the iOS
app)
I suspected all the time that just one single-line change will be what
is needed to make the dialogs look mostly sane. (Especially Format >
Character... and Format > Paragraph...) No exotic hacks were needed
after all, even though I experimented with more or less crazy ones for
several days before I thought of changing this font size 14 to
something smaller.
The problem was apparently simply that with the larger default font,
the dialog controls didn't fit properly in the space provided.
Especially the four combo boxes on one line in the Font page were
problematic. (It has three such lines of combo boxes.)
Apparently the dialog machinery isn't especially good at reducing
width of controls. The Size control shrunk to (almost?) zero width and
was not visible, the Style control was too narrow to be usable, but
the Language control was left as unnecessarily wide.
Change-Id: If5675856345be2ae502346e8c097ef04216e2986
diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index 749541bf964a..8f58c239a677 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -107,7 +107,7 @@ public:
virtual void UpdateSettings( AllSettings &rSettings ) override
{
// Clobber the UI fonts
- vcl::Font aFont( OUString( "Helvetica" ), Size( 0, 14 ) );
+ vcl::Font aFont( OUString::fromUtf8( [[[UIFont systemFontOfSize:7]
familyName] UTF8String] ), Size( 0, 7 ) );
StyleSettings aStyleSet = rSettings.GetStyleSettings();
aStyleSet.SetAppFont( aFont );
commit 70dba37ef6c7a329d6009ae6de70fbf061e7d46e
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Wed Mar 13 23:23:31 2019 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Wed Mar 13 23:23:40 2019 +0200
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.
Change-Id: If6018f41ba0c250a630e3a917f69174eb0782620
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 75dab248267c..86dda316d5d1 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -341,6 +341,9 @@ SvxCharNamePage::SvxCharNamePage( vcl::Window* pParent,
const SfxItemSet& rInSet
m_pCTLFrame->Show(bShowCTL);
get(m_pPreviewWin, "preview");
+#ifdef IOS
+ m_pPreviewWin->Hide();
+#endif
m_pWestFontLanguageLB->SetLanguageList(SvxLanguageListFlags::WESTERN,
true, false, true);
m_pEastFontLanguageLB->SetLanguageList(SvxLanguageListFlags::CJK, true,
false, true);
@@ -1360,6 +1363,9 @@ SvxCharEffectsPage::SvxCharEffectsPage( vcl::Window*
pParent, const SfxItemSet&
get(m_pA11yWarningFT, "a11ywarning");
get(m_pPreviewWin, "preview");
+#ifdef IOS
+ m_pPreviewWin->Hide();
+#endif
Initialize();
}
@@ -2532,6 +2538,9 @@ SvxCharPositionPage::SvxCharPositionPage( vcl::Window*
pParent, const SfxItemSet
get(m_pPairKerningBtn, "pairkerning");
get(m_pPreviewWin, "preview");
+#ifdef IOS
+ m_pPreviewWin->Hide();
+#endif
Initialize();
}
@@ -3166,6 +3175,9 @@ SvxCharTwoLinesPage::SvxCharTwoLinesPage(vcl::Window*
pParent, const SfxItemSet&
get(m_pEndBracketLB, "endbracket");
get(m_pPreviewWin, "preview");
+#ifdef IOS
+ m_pPreviewWin->Hide();
+#endif
Initialize();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
