[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/ios

[Tor Lillqvist (via logerrit)]

 vcl/ios/iosinst.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 82f2575a929f02fb405cb73ee6298f3ec806ebb7
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Mar 14 00:31:33 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 12:03:39 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
    (cherry picked from commit 96dce784c7971f22dcf44b66a242c22b455e32a3)
    Reviewed-on: https://gerrit.libreoffice.org/79183
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx
index cae091bd1d88..596808a0c9f9 100644
--- a/vcl/ios/iosinst.cxx
+++ b/vcl/ios/iosinst.cxx
@@ -108,7 +108,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 );