[Scummvm-cvs-logs] SF.net SVN: scummvm:[35896] scummvm/trunk/gui

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Jan 18 15:45:25 CET 2009


Revision: 35896
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35896&view=rev
Author:   fingolfin
Date:     2009-01-18 14:45:23 +0000 (Sun, 18 Jan 2009)

Log Message:
-----------
GUI: Removed ThemeEngine::getTabSpacing() and getTabPadding(); removed some dead code

Modified Paths:
--------------
    scummvm/trunk/gui/TabWidget.cpp
    scummvm/trunk/gui/TabWidget.h
    scummvm/trunk/gui/ThemeEngine.h

Modified: scummvm/trunk/gui/TabWidget.cpp
===================================================================
--- scummvm/trunk/gui/TabWidget.cpp	2009-01-18 14:42:26 UTC (rev 35895)
+++ scummvm/trunk/gui/TabWidget.cpp	2009-01-18 14:45:23 UTC (rev 35896)
@@ -47,10 +47,6 @@
 }
 
 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 @@
 
 	// 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 @@
 	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() {

Modified: scummvm/trunk/gui/TabWidget.h
===================================================================
--- scummvm/trunk/gui/TabWidget.h	2009-01-18 14:42:26 UTC (rev 35895)
+++ scummvm/trunk/gui/TabWidget.h	2009-01-18 14:45:23 UTC (rev 35896)
@@ -46,9 +46,6 @@
 	int _tabWidth;
 	int _tabHeight;
 
-	int _tabOffset;
-	int _tabSpacing;
-	int _tabPadding;
 	int _titleVPad;
 
 	int _butRP, _butTP, _butW, _butH;

Modified: scummvm/trunk/gui/ThemeEngine.h
===================================================================
--- scummvm/trunk/gui/ThemeEngine.h	2009-01-18 14:42:26 UTC (rev 35895)
+++ scummvm/trunk/gui/ThemeEngine.h	2009-01-18 14:45:23 UTC (rev 35896)
@@ -554,17 +554,6 @@
 	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. */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list