launcher side enhancements to support the "use global font" option from

launcher-settings

3 files changed, 10 insertions, 1 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 5a9ee1b..767efb2 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -1168,13 +1168,16 @@ void Launcher::launcherMessage( const QCString &msg, const QByteArray &data)
         stream >> size;
         int weight;
         stream >> weight;
         int italic;
         stream >> italic;
         if ( tabs->view(id) )
-            tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
+            if ( !fam. isEmpty ( ))
+                tabs->view(id)->setViewFont( QFont(fam, size, weight, italic!=0) );
+            else
+                tabs->view(id)->unsetViewFont();
         qDebug( "setFont: %s, %d, %d, %d", fam.latin1(), size, weight, italic );
     }
     else if ( msg == "setBusyIndicatorType(QString)" ) {
         QString type;
                 stream >> type;
         tabs->setBusyIndicatorType(type);
diff --git a/core/launcher/launcherview.cpp b/core/launcher/launcherview.cpp
index 9fc4565..2a051a6 100644
--- a/core/launcher/launcherview.cpp
+++ b/core/launcher/launcherview.cpp
@@ -847,12 +847,17 @@ void LauncherView::setTextColor( const QColor &tc )
 
 void LauncherView::setViewFont( const QFont &f )
 {
     icons->setFont( f );
 }
 
+void LauncherView::unsetViewFont( )
+{
+    icons->unsetFont( );
+}
+
 void LauncherView::resizeEvent(QResizeEvent *e)
 {
     QVBox::resizeEvent( e );
     if ( e->size().width() != e->oldSize().width() )
         sort();
 }
diff --git a/core/launcher/launcherview.h b/core/launcher/launcherview.h
index 194e4a2..82a319b 100644
--- a/core/launcher/launcherview.h
+++ b/core/launcher/launcherview.h
@@ -61,12 +61,13 @@ public:
     BackgroundType backgroundType() const { return bgType; }
 
     void setTextColor( const QColor & );
     QColor textColor() const { return textCol; }
 
     void setViewFont( const QFont & );
+    void unsetViewFont ( );
 
     void setBusyIndicatorType ( const QString &type );
 
 public slots:
     void populate( AppLnkSet *folder, const QString& categoryfilter );