diff options
Diffstat (limited to 'src/Tab.cc')
-rw-r--r-- | src/Tab.cc | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -20,14 +20,15 @@ | |||
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | #include "Tab.hh" | 22 | #include "Tab.hh" |
23 | #include <iostream> | 23 | |
24 | #ifdef HAVE_CONFIG_H | 24 | #ifdef HAVE_CONFIG_H |
25 | # include "../config.h" | 25 | # include "../config.h" |
26 | #endif // HAVE_CONFIG_H | 26 | #endif // HAVE_CONFIG_H |
27 | #include "i18n.hh" | ||
28 | 27 | ||
29 | #include "misc.hh" | 28 | #include "i18n.hh" |
29 | #include "DrawUtil.hh" | ||
30 | 30 | ||
31 | #include <iostream> | ||
31 | using namespace std; | 32 | using namespace std; |
32 | 33 | ||
33 | bool Tab::m_stoptabs = false; | 34 | bool Tab::m_stoptabs = false; |
@@ -333,11 +334,11 @@ void Tab::draw(bool pressed) { | |||
333 | m_win->getScreen()->getTabPlacement() == PRIGHT) && | 334 | m_win->getScreen()->getTabPlacement() == PRIGHT) && |
334 | (!m_win->isShaded() && m_win->getScreen()->isTabRotateVertical())) { | 335 | (!m_win->isShaded() && m_win->getScreen()->isTabRotateVertical())) { |
335 | 336 | ||
336 | tabtext_w = Misc::XRotTextWidth(m_win->getScreen()->getWindowStyle()->tab.rot_font, | 337 | tabtext_w = DrawUtil::XRotTextWidth(m_win->getScreen()->getWindowStyle()->tab.rot_font, |
337 | m_win->client.title, m_win->client.title_len); | 338 | m_win->client.title, m_win->client.title_len); |
338 | tabtext_w += (m_win->frame.bevel_w * 4); | 339 | tabtext_w += (m_win->frame.bevel_w * 4); |
339 | 340 | ||
340 | Misc::DrawRotString(m_display, m_tabwin, gc, | 341 | DrawUtil::DrawRotString(m_display, m_tabwin, gc, |
341 | m_win->getScreen()->getWindowStyle()->tab.rot_font, | 342 | m_win->getScreen()->getWindowStyle()->tab.rot_font, |
342 | m_win->getScreen()->getWindowStyle()->tab.font.justify, | 343 | m_win->getScreen()->getWindowStyle()->tab.font.justify, |
343 | tabtext_w, m_size_w, m_size_h, | 344 | tabtext_w, m_size_w, m_size_h, |
@@ -357,7 +358,7 @@ void Tab::draw(bool pressed) { | |||
357 | } | 358 | } |
358 | tabtext_w += (m_win->frame.bevel_w * 4); | 359 | tabtext_w += (m_win->frame.bevel_w * 4); |
359 | 360 | ||
360 | Misc::DrawString(m_display, m_tabwin, gc, | 361 | DrawUtil::DrawString(m_display, m_tabwin, gc, |
361 | &m_win->getScreen()->getWindowStyle()->tab.font, | 362 | &m_win->getScreen()->getWindowStyle()->tab.font, |
362 | tabtext_w, m_size_w, | 363 | tabtext_w, m_size_w, |
363 | m_win->frame.bevel_w, m_win->client.title); | 364 | m_win->frame.bevel_w, m_win->client.title); |