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

[fingolfin at users.sourceforge.net]

Revision: 35572
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35572&view=rev
Author:   fingolfin
Date:     2008-12-27 14:36:28 +0000 (Sat, 27 Dec 2008)

Log Message:
-----------
GUI: Added Widget::setVisible convenience wrapper

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/saveload.cpp
    scummvm/trunk/engines/scumm/dialogs.cpp
    scummvm/trunk/gui/ScrollBarWidget.cpp
    scummvm/trunk/gui/saveload.cpp
    scummvm/trunk/gui/widget.cpp
    scummvm/trunk/gui/widget.h

Modified: scummvm/trunk/engines/parallaction/saveload.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/saveload.cpp	2008-12-27 14:30:30 UTC (rev 35571)
+++ scummvm/trunk/engines/parallaction/saveload.cpp	2008-12-27 14:36:28 UTC (rev 35572)
@@ -319,11 +319,11 @@
 }
 
 void SaveLoadChooser::reflowLayout() {
-	_container->setFlags(GUI::WIDGET_INVISIBLE);
-	_gfxWidget->setFlags(GUI::WIDGET_INVISIBLE);
-	_date->setFlags(GUI::WIDGET_INVISIBLE);
-	_time->setFlags(GUI::WIDGET_INVISIBLE);
-	_playtime->setFlags(GUI::WIDGET_INVISIBLE);
+	_container->setVisible(false);
+	_gfxWidget->setVisible(false);
+	_date->setVisible(false);
+	_time->setVisible(false);
+	_playtime->setVisible(false);
 
 	Dialog::reflowLayout();
 }

Modified: scummvm/trunk/engines/scumm/dialogs.cpp
===================================================================
--- scummvm/trunk/engines/scumm/dialogs.cpp	2008-12-27 14:30:30 UTC (rev 35571)
+++ scummvm/trunk/engines/scumm/dialogs.cpp	2008-12-27 14:36:28 UTC (rev 35572)
@@ -342,22 +342,22 @@
 
 		_playtime->resize(thumbX, height, kThumbnailWidth, kLineHeight);
 
-		_container->clearFlags(GUI::WIDGET_INVISIBLE);
-		_gfxWidget->clearFlags(GUI::WIDGET_INVISIBLE);
-		_date->clearFlags(GUI::WIDGET_INVISIBLE);
-		_time->clearFlags(GUI::WIDGET_INVISIBLE);
-		_playtime->clearFlags(GUI::WIDGET_INVISIBLE);
+		_container->setVisible(true);
+		_gfxWidget->setVisible(true);
+		_date->setVisible(true);
+		_time->setVisible(true);
+		_playtime->setVisible(true);
 
 		_fillR = 0; //g_gui.evaluator()->getVar("scummsaveload_thumbnail.fillR");
 		_fillG = 0; //g_gui.evaluator()->getVar("scummsaveload_thumbnail.fillG");
 		_fillB = 0; //g_gui.evaluator()->getVar("scummsaveload_thumbnail.fillB");
 		updateInfos(false);
 	} else {
-		_container->setFlags(GUI::WIDGET_INVISIBLE);
-		_gfxWidget->setFlags(GUI::WIDGET_INVISIBLE);
-		_date->setFlags(GUI::WIDGET_INVISIBLE);
-		_time->setFlags(GUI::WIDGET_INVISIBLE);
-		_playtime->setFlags(GUI::WIDGET_INVISIBLE);
+		_container->setVisible(false);
+		_gfxWidget->setVisible(false);
+		_date->setVisible(false);
+		_time->setVisible(false);
+		_playtime->setVisible(false);
 	}
 
 	Dialog::reflowLayout();

Modified: scummvm/trunk/gui/ScrollBarWidget.cpp
===================================================================
--- scummvm/trunk/gui/ScrollBarWidget.cpp	2008-12-27 14:30:30 UTC (rev 35571)
+++ scummvm/trunk/gui/ScrollBarWidget.cpp	2008-12-27 14:36:28 UTC (rev 35572)
@@ -175,11 +175,11 @@
 			UP_DOWN_BOX_HEIGHT + (_h - 2 * UP_DOWN_BOX_HEIGHT - _sliderHeight) * _currentPos / (_numEntries - _entriesPerPage);
 		if (_sliderPos < 0)
 			_sliderPos = 0;
-		clearFlags(WIDGET_INVISIBLE);
+		setVisible(true);
 	} else {
 		_sliderHeight = _h - 2 * UP_DOWN_BOX_HEIGHT;
 		_sliderPos = UP_DOWN_BOX_HEIGHT;
-		setFlags(WIDGET_INVISIBLE);
+		setVisible(false);
 	}
 }
 

Modified: scummvm/trunk/gui/saveload.cpp
===================================================================
--- scummvm/trunk/gui/saveload.cpp	2008-12-27 14:30:30 UTC (rev 35571)
+++ scummvm/trunk/gui/saveload.cpp	2008-12-27 14:36:28 UTC (rev 35572)
@@ -197,32 +197,24 @@
 		if (_playTimeSupport)
 			_playtime->resize(thumbX, height, kThumbnailWidth, kLineHeight);
 
-		_container->clearFlags(GUI::WIDGET_INVISIBLE);
-		_gfxWidget->clearFlags(GUI::WIDGET_INVISIBLE);
+		_container->setVisible(true);
+		_gfxWidget->setVisible(true);
 
-		if (_saveDateSupport) {
-			_date->clearFlags(GUI::WIDGET_INVISIBLE);
-			_time->clearFlags(GUI::WIDGET_INVISIBLE);
-		} else {
-			_date->setFlags(GUI::WIDGET_INVISIBLE);
-			_time->setFlags(GUI::WIDGET_INVISIBLE);
-		}
+		_date->setVisible(_saveDateSupport);
+		_time->setVisible(_saveDateSupport);
 
-		if (_playTimeSupport)
-			_playtime->clearFlags(GUI::WIDGET_INVISIBLE);
-		else
-			_playtime->setFlags(GUI::WIDGET_INVISIBLE);
+		_playtime->setVisible(_playTimeSupport);
 
 		_fillR = 0;
 		_fillG = 0;
 		_fillB = 0;
 		updateSelection(false);
 	} else {
-		_container->setFlags(GUI::WIDGET_INVISIBLE);
-		_gfxWidget->setFlags(GUI::WIDGET_INVISIBLE);
-		_date->setFlags(GUI::WIDGET_INVISIBLE);
-		_time->setFlags(GUI::WIDGET_INVISIBLE);
-		_playtime->setFlags(GUI::WIDGET_INVISIBLE);
+		_container->setVisible(false);
+		_gfxWidget->setVisible(false);
+		_date->setVisible(false);
+		_time->setVisible(false);
+		_playtime->setVisible(false);
 	}
 
 	Dialog::reflowLayout();

Modified: scummvm/trunk/gui/widget.cpp
===================================================================
--- scummvm/trunk/gui/widget.cpp	2008-12-27 14:30:30 UTC (rev 35571)
+++ scummvm/trunk/gui/widget.cpp	2008-12-27 14:36:28 UTC (rev 35572)
@@ -145,6 +145,13 @@
 	return 0;
 }
 
+void Widget::setEnabled(bool e) {
+	if (e)
+		setFlags(WIDGET_ENABLED);
+	else
+		clearFlags(WIDGET_ENABLED);
+}
+
 bool Widget::isEnabled() const {
 	if (g_gui.xmlEval()->getVar("Dialog." + _name + ".Enabled", 1) == 0) {
 		return false;
@@ -152,6 +159,13 @@
 	return ((_flags & WIDGET_ENABLED) != 0);
 }
 
+void Widget::setVisible(bool e) {
+	if (e)
+		clearFlags(WIDGET_INVISIBLE);
+	else
+		setFlags(WIDGET_INVISIBLE);
+}
+
 bool Widget::isVisible() const {
 	if (g_gui.xmlEval()->getVar("Dialog." + _name + ".Visible", 1) == 0)
 		return false;

Modified: scummvm/trunk/gui/widget.h
===================================================================
--- scummvm/trunk/gui/widget.h	2008-12-27 14:30:30 UTC (rev 35571)
+++ scummvm/trunk/gui/widget.h	2008-12-27 14:36:28 UTC (rev 35572)
@@ -122,8 +122,10 @@
 	void clearFlags(int flags);
 	int getFlags() const		{ return _flags; }
 
-	void setEnabled(bool e)		{ if (e) setFlags(WIDGET_ENABLED); else clearFlags(WIDGET_ENABLED); }
+	void setEnabled(bool e);
 	bool isEnabled() const;
+
+	void setVisible(bool e);
 	bool isVisible() const;
 
 protected:


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