[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - include/sfx2 sfx2/source

[Jan Holesovsky]

 include/sfx2/recentdocsview.hxx        |    3 +++
 sfx2/source/control/recentdocsview.cxx |   25 +++++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 2a005fcc9a7eb92f0029a47c9796975250fc4d14
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Aug 1 15:13:34 2014 +0200

    hidpi, startcenter: Don't set fixed font heigt in the startcenter.
    
    Change-Id: I68efbd08d21b514ab1659cd6bddfc2c4788c4a74
    Reviewed-on: https://gerrit.libreoffice.org/10682
    Reviewed-by: Zolnai Tamás <tamas.zolnai at collabora.com>
    Tested-by: Zolnai Tamás <tamas.zolnai at collabora.com>

diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 453eb3f..ac5cc92 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -73,6 +73,9 @@ protected:
 
     bool isAcceptedFile(const OUString &rURL) const;
 
+    /// Set (larger) font for the Welcome message.
+    void SetMessageFont();
+
     long    mnItemMaxSize;
     long    mnTextHeight;
     long    mnItemPadding;
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index f0c9c05..0fcb12d 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -117,6 +117,13 @@ bool RecentDocsView::isAcceptedFile(const OUString &rURL) const
            (mnFileTypes & TYPE_OTHER    && typeMatchesExtension(TYPE_OTHER,   aExt));
 }
 
+void RecentDocsView::SetMessageFont()
+{
+    Font aFont(GetFont());
+    aFont.SetHeight(aFont.GetHeight()*1.3);
+    SetFont(aFont);
+}
+
 BitmapEx RecentDocsView::getDefaultThumbnail(const OUString &rURL)
 {
     BitmapEx aImg;
@@ -195,13 +202,11 @@ void RecentDocsView::Reload()
     Invalidate();
 
     // Set preferred width
-    if( mFilteredItemList.empty() )
+    if (mFilteredItemList.empty())
     {
         Font aOldFont(GetFont());
-        Font aNewFont(aOldFont);
-        aNewFont.SetHeight(20);
-        SetFont(aNewFont);
-        set_width_request(std::max(GetTextWidth(maWelcomeLine1),GetTextWidth(maWelcomeLine2)));
+        SetMessageFont();
+        set_width_request(std::max(GetTextWidth(maWelcomeLine1), GetTextWidth(maWelcomeLine2)));
         SetFont(aOldFont);
     }
     else
@@ -257,9 +262,7 @@ void RecentDocsView::Paint( const Rectangle &aRect )
     {
         // No recent files to be shown yet. Show a welcome screen.
         Font aOldFont(GetFont());
-        Font aNewFont(aOldFont);
-        aNewFont.SetHeight(20);
-        SetFont(aNewFont);
+        SetMessageFont();
 
         long nTextHeight = GetTextHeight();
 
@@ -301,10 +304,8 @@ long RecentDocsView::GetThumbnailSize() const
 void RecentDocsView::Clear()
 {
     Font aOldFont(GetFont());
-    Font aNewFont(aOldFont);
-    aNewFont.SetHeight(20);
-    SetFont(aNewFont);
-    set_width_request(std::max(GetTextWidth(maWelcomeLine1),GetTextWidth(maWelcomeLine2)));
+    SetMessageFont();
+    set_width_request(std::max(GetTextWidth(maWelcomeLine1), GetTextWidth(maWelcomeLine2)));
     SetFont(aOldFont);
 
     ThumbnailView::Clear();