- added a "[x] Use custom font" checkbox -- if this is not checked

  (default), then launcher uses the global font for the tabs.
- reworked the internal handling of "All tabs", to make it possible to use
  this information for newly added tabs (still missing)

1 files changed, 9 insertions, 4 deletions

diff --git a/core/settings/launcher/tabconfig.h b/core/settings/launcher/tabconfig.h
index eebfd36..9086341 100644
--- a/core/settings/launcher/tabconfig.h
+++ b/core/settings/launcher/tabconfig.h
@@ -43,6 +43,7 @@ struct TabConfig {
 	QString        m_bg_image;
 	QString        m_bg_color;
 	QString        m_text_color;
+	bool           m_font_use;
 	QString        m_font_family;
 	int            m_font_size;
 	int            m_font_weight;
@@ -56,10 +57,14 @@ struct TabConfig {
 		       ( m_bg_image == tc. m_bg_image ) &&
 		       ( m_bg_color == tc. m_bg_color ) &&
 		       ( m_text_color == tc. m_text_color ) &&
-		       ( m_font_family == tc. m_font_family ) &&
-		       ( m_font_size == tc. m_font_size ) &&
-		       ( m_font_weight == tc. m_font_weight ) &&
-		       ( m_font_italic == tc. m_font_italic );
+		       ( m_font_use == tc. m_font_use ) && 
+		       ( m_font_use ? (
+		         ( m_font_family == tc. m_font_family ) &&
+		         ( m_font_size == tc. m_font_size ) &&
+		         ( m_font_weight == tc. m_font_weight ) &&
+		         ( m_font_italic == tc. m_font_italic )
+		        ) : true );
+		        
 	}
 };