diff options
| -rw-r--r-- | gui/TabWidget.cpp | 12 | ||||
| -rw-r--r-- | gui/TabWidget.h | 3 | ||||
| -rw-r--r-- | gui/ThemeEngine.h | 11 |
3 files changed, 2 insertions, 24 deletions
diff --git a/gui/TabWidget.cpp b/gui/TabWidget.cpp index 3fe000e1ec..9b77b2f00c 100644 --- a/gui/TabWidget.cpp +++ b/gui/TabWidget.cpp @@ -47,10 +47,6 @@ TabWidget::TabWidget(GuiObject *boss, const String &name) } void TabWidget::init() { - _tabOffset = 0; // TODO - _tabSpacing = g_gui.theme()->getTabSpacing(); - _tabPadding = g_gui.theme()->getTabPadding(); - setFlags(WIDGET_ENABLED); _type = kTabWidget; _activeTab = -1; @@ -185,8 +181,8 @@ void TabWidget::handleMouseDown(int x, int y, int button, int clickCount) { // Determine which tab was clicked int tabID = -1; - if (x >= 0 && x % (_tabWidth + _tabSpacing) < _tabWidth) { - tabID = x / (_tabWidth + _tabSpacing); + if (x >= 0 && (x % _tabWidth) < _tabWidth) { + tabID = x / _tabWidth; if (tabID >= (int)_tabs.size()) tabID = -1; } @@ -242,10 +238,6 @@ void TabWidget::reflowLayout() { int y = _butTP - _tabHeight; _navLeft->resize(x, y, _butW, _butH); _navRight->resize(x + _butW + 2, y, _butW, _butH); - - _tabOffset = 0; // TODO - _tabSpacing = g_gui.theme()->getTabSpacing(); - _tabPadding = g_gui.theme()->getTabPadding(); } void TabWidget::drawWidget() { diff --git a/gui/TabWidget.h b/gui/TabWidget.h index 973d65dddb..3914839f63 100644 --- a/gui/TabWidget.h +++ b/gui/TabWidget.h @@ -46,9 +46,6 @@ protected: int _tabWidth; int _tabHeight; - int _tabOffset; - int _tabSpacing; - int _tabPadding; int _titleVPad; int _butRP, _butTP, _butW, _butH; diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index 84e753a4f9..cb1b3dfd07 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -554,17 +554,6 @@ private: static Common::String getThemeId(const Common::String &filename); static void listUsableThemes(Common::FSNode node, Common::List<ThemeDescriptor> &list, int depth=-1); -public: - /** - * @name LEGACY: Old GUI::Theme API - */ - //@{ - - int getTabSpacing() const { return 0; } - int getTabPadding() const { return 3; } - - //@} - protected: OSystem *_system; /** Global system object. */ |