[Scummvm-cvs-logs] SF.net SVN: scummvm:[33765] scummvm/branches/gsoc2008-gui/gui

Tanoku at users.sourceforge.net Tanoku at users.sourceforge.net
Sun Aug 10 20:35:30 CEST 2008


Revision: 33765
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33765&view=rev
Author:   Tanoku
Date:     2008-08-10 18:35:27 +0000 (Sun, 10 Aug 2008)

Log Message:
-----------
Reverted debug layout drawing.
Bugfix: Scrollbar overlapping in text widgets/text overlapping?

Modified Paths:
--------------
    scummvm/branches/gsoc2008-gui/gui/ListWidget.cpp
    scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
    scummvm/branches/gsoc2008-gui/gui/themes/scummodern.stx
    scummvm/branches/gsoc2008-gui/gui/themes/scummodern.zip

Modified: scummvm/branches/gsoc2008-gui/gui/ListWidget.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ListWidget.cpp	2008-08-10 18:26:14 UTC (rev 33764)
+++ scummvm/branches/gsoc2008-gui/gui/ListWidget.cpp	2008-08-10 18:35:27 UTC (rev 33765)
@@ -398,7 +398,7 @@
 		if (_selectedItem == pos && _editMode) {
 			buffer = _editString;
 			adjustOffset();
-			width = _w - r.left - _hlRightPadding - _leftPadding;
+			width = _w - r.left - _hlRightPadding - _leftPadding - _scrollBarWidth;
 			g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + width, y + fontHeight-2), 
 									buffer, _state, Theme::kTextAlignLeft, inverted, pad);
 		} else {
@@ -409,7 +409,7 @@
 				if (width > _w - r.left)
 					width = _w - r.left;
 			} else
-				width = _w - r.left - _hlRightPadding;
+				width = _w - r.left - _hlRightPadding - _scrollBarWidth;
 			if (width > maxWidth)
 				maxWidth = width;
 			g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + maxWidth, y + fontHeight-2), 

Modified: scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-10 18:26:14 UTC (rev 33764)
+++ scummvm/branches/gsoc2008-gui/gui/ThemeRenderer.cpp	2008-08-10 18:35:27 UTC (rev 33765)
@@ -866,11 +866,11 @@
 		_textQueue.clear();
 	}
 		
-//	renderDirtyScreen();
+	renderDirtyScreen();
 
-	_vectorRenderer->fillSurface();
-	themeEval()->debugDraw(_screen, _font);
-	_vectorRenderer->copyWholeFrame(_system);
+//	_vectorRenderer->fillSurface();
+//	themeEval()->debugDraw(_screen, _font);
+//	_vectorRenderer->copyWholeFrame(_system);
 }
 
 void ThemeRenderer::renderDirtyScreen() {

Modified: scummvm/branches/gsoc2008-gui/gui/themes/scummodern.stx
===================================================================
--- scummvm/branches/gsoc2008-gui/gui/themes/scummodern.stx	2008-08-10 18:26:14 UTC (rev 33764)
+++ scummvm/branches/gsoc2008-gui/gui/themes/scummodern.stx	2008-08-10 18:35:27 UTC (rev 33765)
@@ -478,7 +478,7 @@
 		<def resolution = '320xY' var = 'About.OuterBorder' value = '16'/>
 		
 		<def var = 'ListWidget.hlLeftPadding' value = '0'/>
-		<def var = 'ListWidget.hlRightPadding' value = '16'/>
+		<def var = 'ListWidget.hlRightPadding' value = '0'/>
 		<def var = 'PopUpWidget.labelSpacing' value = '10' />
 		
 		<def var = 'ShowLauncherLogo' value = '1'/>


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