[Scummvm-cvs-logs] SF.net SVN: scummvm:[45860] scummvm/trunk/engines/sci/gui/gui_menu.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Thu Nov 12 14:01:35 CET 2009


Revision: 45860
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45860&view=rev
Author:   m_kiewitz
Date:     2009-11-12 13:01:35 +0000 (Thu, 12 Nov 2009)

Log Message:
-----------
SCI/newgui: SciGuiMenu adjustment, when no right aligned text is available at all (makes lsl6 menu pixel perfect)

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_menu.cpp

Modified: scummvm/trunk/engines/sci/gui/gui_menu.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_menu.cpp	2009-11-12 12:49:17 UTC (rev 45859)
+++ scummvm/trunk/engines/sci/gui/gui_menu.cpp	2009-11-12 13:01:35 UTC (rev 45860)
@@ -491,6 +491,8 @@
 	}
 	_menuRect.right = _menuRect.left + 16 + 4 + 2;
 	_menuRect.right += maxTextWidth + maxTextRightAlignedWidth;
+	if (!maxTextRightAlignedWidth)
+		_menuRect.right -= 5;
 
 	// Save background
 	_menuSaveHandle = _gfx->BitsSave(_menuRect, SCI_SCREEN_MASK_VISUAL);
@@ -513,6 +515,7 @@
 				_text->Draw_String(listItemEntry->textRightAligned.c_str());
 			} else {
 				// We dont 100% follow sierra here, we draw the line from left to right. Looks better
+				// BTW. SCI1.1 seems to put 2 pixels and then skip one, we don't do this at all (lsl6)
 				pixelPos.y = topPos + (_gfx->_curPort->fontHeight >> 1) - 1;
 				pixelPos.x = _menuRect.left - 7;
 				while (pixelPos.x < (_menuRect.right - 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