Diffstat (limited to 'core/settings/launcher/tabconfig.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/settings/launcher/tabconfig.h | 13 |
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 | |||
@@ -42,8 +42,9 @@ struct TabConfig { | |||
42 | BackgroundType m_bg_type; | 42 | BackgroundType m_bg_type; |
43 | QString m_bg_image; | 43 | QString m_bg_image; |
44 | QString m_bg_color; | 44 | QString m_bg_color; |
45 | QString m_text_color; | 45 | QString m_text_color; |
46 | bool m_font_use; | ||
46 | QString m_font_family; | 47 | QString m_font_family; |
47 | int m_font_size; | 48 | int m_font_size; |
48 | int m_font_weight; | 49 | int m_font_weight; |
49 | bool m_font_italic; | 50 | bool m_font_italic; |
@@ -55,12 +56,16 @@ struct TabConfig { | |||
55 | ( m_bg_type == tc. m_bg_type ) && | 56 | ( m_bg_type == tc. m_bg_type ) && |
56 | ( m_bg_image == tc. m_bg_image ) && | 57 | ( m_bg_image == tc. m_bg_image ) && |
57 | ( m_bg_color == tc. m_bg_color ) && | 58 | ( m_bg_color == tc. m_bg_color ) && |
58 | ( m_text_color == tc. m_text_color ) && | 59 | ( m_text_color == tc. m_text_color ) && |
59 | ( m_font_family == tc. m_font_family ) && | 60 | ( m_font_use == tc. m_font_use ) && |
60 | ( m_font_size == tc. m_font_size ) && | 61 | ( m_font_use ? ( |
61 | ( m_font_weight == tc. m_font_weight ) && | 62 | ( m_font_family == tc. m_font_family ) && |
62 | ( m_font_italic == tc. m_font_italic ); | 63 | ( m_font_size == tc. m_font_size ) && |
64 | ( m_font_weight == tc. m_font_weight ) && | ||
65 | ( m_font_italic == tc. m_font_italic ) | ||
66 | ) : true ); | ||
67 | |||
63 | } | 68 | } |
64 | }; | 69 | }; |
65 | 70 | ||
66 | #endif | 71 | #endif |