[Gemrb-commits] gemrb: branch master updated. v0.7.0-363-gbae3979

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  bae39793630a85d2ea35d2eebec29b5d8d15ff70 (commit)

Summary of changes:
 gemrb/GUIScripts/pst/FloatMenuWindow.py |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
      from  2803c55d298fd39a9011133d35b771f45c173b26 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=bae39793630a85d2ea35d2eebec29b5d8d15ff70

commit bae39793630a85d2ea35d2eebec29b5d8d15ff70
Author: Avenger <ave...@so...>
Date:   Mon Feb 20 19:50:38 2012 +0100

    no need of SetPushOffset (if it is planned to only ever 0,0 or 2,2 then it is not necessary)

diff --git a/gemrb/GUIScripts/pst/FloatMenuWindow.py b/gemrb/GUIScripts/pst/FloatMenuWindow.py
index 044b2fe..e5d2f05 100644
--- a/gemrb/GUIScripts/pst/FloatMenuWindow.py
+++ b/gemrb/GUIScripts/pst/FloatMenuWindow.py
@@ -209,7 +209,7 @@ def OpenFloatMenuWindow ():
 		Button.SetFlags (IE_GUI_BUTTON_ALIGN_RIGHT | IE_GUI_BUTTON_ALIGN_BOTTOM, OP_OR)
 		Button.SetVarAssoc ('ItemButton', i)
 		Button.SetFont ('NUMBER')
-		Button.SetPushOffset (0, 0)
+		#Button.SetPushOffset (0, 0)
 
 	# BAMs:
 	# AMALLSTP - 41655
@@ -411,7 +411,8 @@ def UpdateFloatMenuItem (pc, i, weapons):
 	if weapons and i==4:
 		# FIXME: rather call UpdateFloatMenuGroupAction?
 		Button.SetActionIcon (globals(), ACT_DEFEND)
-		Button.SetState (IE_GUI_BUTTON_ENABLED)
+		#Button.SetState (IE_GUI_BUTTON_ENABLED)
+		Button.SetState (IE_GUI_BUTTON_LOCKED)
 		return
 		
 	#if slot_item and slottype:
@@ -429,7 +430,8 @@ def UpdateFloatMenuItem (pc, i, weapons):
 			Button.SetTooltip (item['ItemNameIdentified'])
 		#Button.SetFlags (IE_GUI_BUTTON_NO_IMAGE, OP_NAND)
 		Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, SelectItem)
-		Button.SetState (IE_GUI_BUTTON_ENABLED)
+		#Button.SetState (IE_GUI_BUTTON_ENABLED)
+		Button.SetState (IE_GUI_BUTTON_LOCKED)
 		#Button.SetVarAssoc ('ItemButton', i)
 		return
 
@@ -469,7 +471,8 @@ def UpdateFloatMenuSpell (pc, i):
 		Button.SetTooltip (spell['SpellName'])
 		Button.SetEvent (IE_GUI_BUTTON_ON_PRESS, SelectItem)
 		#Button.SetVarAssoc ('ItemButton', i)
-		Button.SetState (IE_GUI_BUTTON_ENABLED)
+		#Button.SetState (IE_GUI_BUTTON_ENABLED)
+		Button.SetState (IE_GUI_BUTTON_LOCKED)
 	else:
 		ClearSlot (i)
 

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator