aboutsummaryrefslogtreecommitdiff
path: root/src/Tab.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Tab.cc')
-rw-r--r--src/Tab.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Tab.cc b/src/Tab.cc
index 22925c0..a14de09 100644
--- a/src/Tab.cc
+++ b/src/Tab.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: Tab.cc,v 1.21 2002/04/03 12:08:54 fluxgen Exp $ 22// $Id: Tab.cc,v 1.22 2002/04/03 23:01:04 fluxgen Exp $
23 23
24#include "Tab.hh" 24#include "Tab.hh"
25 25
@@ -361,33 +361,33 @@ void Tab::draw(bool pressed) {
361 (!m_win->isShaded() && m_win->getScreen()->isTabRotateVertical())) { 361 (!m_win->isShaded() && m_win->getScreen()->isTabRotateVertical())) {
362 362
363 tabtext_w = DrawUtil::XRotTextWidth(m_win->getScreen()->getWindowStyle()->tab.rot_font, 363 tabtext_w = DrawUtil::XRotTextWidth(m_win->getScreen()->getWindowStyle()->tab.rot_font,
364 m_win->client.title, m_win->client.title_len); 364 m_win->getTitle().c_str(), m_win->getTitle().size());
365 tabtext_w += (m_win->frame.bevel_w * 4); 365 tabtext_w += (m_win->frame.bevel_w * 4);
366 366
367 DrawUtil::DrawRotString(m_display, m_tabwin, gc, 367 DrawUtil::DrawRotString(m_display, m_tabwin, gc,
368 m_win->getScreen()->getWindowStyle()->tab.rot_font, 368 m_win->getScreen()->getWindowStyle()->tab.rot_font,
369 m_win->getScreen()->getWindowStyle()->tab.font.justify, 369 m_win->getScreen()->getWindowStyle()->tab.font.justify,
370 tabtext_w, m_size_w, m_size_h, 370 tabtext_w, m_size_w, m_size_h,
371 m_win->frame.bevel_w, m_win->client.title); 371 m_win->frame.bevel_w, m_win->getTitle().c_str());
372 372
373 } else { 373 } else {
374 if (I18n::instance()->multibyte()) { // TODO: maybe move this out from here? 374 if (I18n::instance()->multibyte()) { // TODO: maybe move this out from here?
375 XRectangle ink, logical; 375 XRectangle ink, logical;
376 XmbTextExtents(m_win->getScreen()->getWindowStyle()->tab.font.set, 376 XmbTextExtents(m_win->getScreen()->getWindowStyle()->tab.font.set,
377 m_win->client.title, m_win->client.title_len, 377 m_win->getTitle().c_str(), m_win->getTitle().size(),
378 &ink, &logical); 378 &ink, &logical);
379 tabtext_w = logical.width; 379 tabtext_w = logical.width;
380 } else { 380 } else {
381 tabtext_w = XTextWidth( 381 tabtext_w = XTextWidth(
382 m_win->getScreen()->getWindowStyle()->tab.font.fontstruct, 382 m_win->getScreen()->getWindowStyle()->tab.font.fontstruct,
383 m_win->client.title, m_win->client.title_len); 383 m_win->getTitle().c_str(), m_win->getTitle().size());
384 } 384 }
385 tabtext_w += (m_win->frame.bevel_w * 4); 385 tabtext_w += (m_win->frame.bevel_w * 4);
386 386
387 DrawUtil::DrawString(m_display, m_tabwin, gc, 387 DrawUtil::DrawString(m_display, m_tabwin, gc,
388 &m_win->getScreen()->getWindowStyle()->tab.font, 388 &m_win->getScreen()->getWindowStyle()->tab.font,
389 tabtext_w, m_size_w, 389 tabtext_w, m_size_w,
390 m_win->frame.bevel_w, m_win->client.title); 390 m_win->frame.bevel_w, m_win->getTitle().c_str());
391 } 391 }
392} 392}
393 393