diff options
author | Torbjörn Andersson | 2005-06-03 12:00:38 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2005-06-03 12:00:38 +0000 |
commit | 64083773377630442fd1d43d3882fde0c3d066e4 (patch) | |
tree | aac07d95c0cd37787382730457df3964b42f4b05 /gui/TabWidget.cpp | |
parent | 7dfa96a8b882a216a8a4ee8715871f18a5622921 (diff) | |
download | scummvm-rg350-64083773377630442fd1d43d3882fde0c3d066e4.tar.gz scummvm-rg350-64083773377630442fd1d43d3882fde0c3d066e4.tar.bz2 scummvm-rg350-64083773377630442fd1d43d3882fde0c3d066e4.zip |
Cleanup.
svn-id: r18320
Diffstat (limited to 'gui/TabWidget.cpp')
-rw-r--r-- | gui/TabWidget.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/gui/TabWidget.cpp b/gui/TabWidget.cpp index 5d821e9d48..e0657af94a 100644 --- a/gui/TabWidget.cpp +++ b/gui/TabWidget.cpp @@ -44,19 +44,10 @@ TabWidget::TabWidget(GuiObject *boss, int x, int y, int w, int h, WidgetSize ws) _tabWidth = 40; - switch (_ws) { - case kNormalWidgetSize: - _font = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont); - _tabHeight = kTabHeight; - break; - case kBigWidgetSize: - _font = FontMan.getFontByUsage(Graphics::FontManager::kBigGUIFont); + if (_ws == kBigWidgetSize) { _tabHeight = kBigTabHeight; - break; - case kDefaultWidgetSize: - _font = &g_gui.getFont(); + } else { _tabHeight = kTabHeight; - break; } } @@ -83,7 +74,7 @@ int TabWidget::addTab(const String &title) { int numTabs = _tabs.size(); // Determine the new tab width - int newWidth = _font->getStringWidth(title) + 2 * kTabPadding; + int newWidth = g_gui.getStringWidth(title) + 2 * kTabPadding; if (_tabWidth < newWidth) _tabWidth = newWidth; int maxWidth = (_w - kTabLeftOffset) / numTabs - kTabLeftOffset; @@ -171,7 +162,7 @@ void TabWidget::drawWidget(bool hilite) { OverlayColor color = (i == _activeTab) ? gui->_color : gui->_shadowcolor; int yOffset = (i == _activeTab) ? 0 : 2; box(x, _y + yOffset, _tabWidth, _tabHeight - yOffset, color, color, (i == _activeTab)); - gui->drawString(_font, _tabs[i].title, x + kTabPadding, _y + yOffset / 2 + (_tabHeight - _font->getFontHeight() - 3), _tabWidth - 2 * kTabPadding, gui->_textcolor, kTextAlignCenter); + gui->drawString(_tabs[i].title, x + kTabPadding, _y + yOffset / 2 + (_tabHeight - gui->getFontHeight() - 3), _tabWidth - 2 * kTabPadding, gui->_textcolor, kTextAlignCenter); x += _tabWidth + kTabSpacing; } |