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

[lordhoto at users.sourceforge.net]

Revision: 21795
Author:   lordhoto
Date:     2006-04-11 09:28:00 -0700 (Tue, 11 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=21795&view=rev

Log Message:
-----------
Fixes disappearing borders with classic theme.

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeClassic.cpp
    scummvm/trunk/gui/theme.h
Modified: scummvm/trunk/gui/ThemeClassic.cpp
===================================================================
--- scummvm/trunk/gui/ThemeClassic.cpp	2006-04-11 16:05:59 UTC (rev 21794)
+++ scummvm/trunk/gui/ThemeClassic.cpp	2006-04-11 16:28:00 UTC (rev 21795)
@@ -112,6 +112,7 @@
 		delete _dialog;
 		_dialog = 0;
 	}
+	_forceRedraw = true;
 #endif
 }
 
@@ -124,8 +125,7 @@
 }
 
 void ThemeClassic::drawAll() {
-	if (!_initOk)
-		return;
+	_forceRedraw = false;
 }
 
 void ThemeClassic::resetDrawArea() {
@@ -140,7 +140,7 @@
 	
 	restoreBackground(r);
 	
-	if ((hints & THEME_HINT_SAVE_BACKGROUND) && !(hints & THEME_HINT_FIRST_DRAW)) {
+	if ((hints & THEME_HINT_SAVE_BACKGROUND) && !(hints & THEME_HINT_FIRST_DRAW) && !_forceRedraw) {
 		addDirtyRect(r);
 		return;
 	}
@@ -178,7 +178,7 @@
 
 	restoreBackground(r);
 	
-	if ((hints & THEME_HINT_SAVE_BACKGROUND) && !(hints & THEME_HINT_FIRST_DRAW)) {
+	if ((hints & THEME_HINT_SAVE_BACKGROUND) && !(hints & THEME_HINT_FIRST_DRAW) && !_forceRedraw) {
 		addDirtyRect(r);
 		return;
 	}

Modified: scummvm/trunk/gui/theme.h
===================================================================
--- scummvm/trunk/gui/theme.h	2006-04-11 16:05:59 UTC (rev 21794)
+++ scummvm/trunk/gui/theme.h	2006-04-11 16:28:00 UTC (rev 21795)
@@ -249,6 +249,7 @@
 	void blendScreenToDialog();
 #endif
 
+	bool _forceRedraw;
 	bool _initOk;
 
 	const Graphics::Font *_font;


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