diff options
Diffstat (limited to 'src/ToolFactory.cc')
-rw-r--r-- | src/ToolFactory.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/ToolFactory.cc b/src/ToolFactory.cc index 4034313..60b283c 100644 --- a/src/ToolFactory.cc +++ b/src/ToolFactory.cc | |||
@@ -139,18 +139,13 @@ void ToolFactory::updateThemes() { | |||
139 | 139 | ||
140 | 140 | ||
141 | int ToolFactory::maxFontHeight() { | 141 | int ToolFactory::maxFontHeight() { |
142 | unsigned int max_height = 0; | ||
143 | if (max_height < m_clock_theme.font().height()) | ||
144 | max_height = m_clock_theme.font().height(); | ||
145 | |||
146 | if (max_height < m_focused_iconbar_theme.text().font().height()) | ||
147 | max_height = m_focused_iconbar_theme.text().font().height(); | ||
148 | 142 | ||
149 | if (max_height < m_unfocused_iconbar_theme.text().font().height()) | 143 | unsigned int max_height = 0; |
150 | max_height = m_unfocused_iconbar_theme.text().font().height(); | ||
151 | 144 | ||
152 | if (max_height < m_workspace_theme->font().height()) | 145 | max_height = std::max(max_height, m_clock_theme.font().height()); |
153 | max_height = m_workspace_theme->font().height(); | 146 | max_height = std::max(max_height, m_focused_iconbar_theme.text().font().height()); |
147 | max_height = std::max(max_height, m_unfocused_iconbar_theme.text().font().height()); | ||
148 | max_height = std::max(max_height, m_workspace_theme->font().height()); | ||
154 | 149 | ||
155 | return max_height; | 150 | return max_height; |
156 | } | 151 | } |