[Gemrb-commits] gemrb/gemrb/GUIScripts/bg1 GUIINV.py,1.26,1.27

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

Update of /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg1
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11641/bg1

Modified Files:
	GUIINV.py 
Log Message:
more border fixes (yellow highlight still not done)


Index: GUIINV.py
===================================================================
RCS file: /cvsroot/gemrb/gemrb/gemrb/GUIScripts/bg1/GUIINV.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** GUIINV.py	27 Dec 2006 18:45:37 -0000	1.26
--- GUIINV.py	27 Dec 2006 19:45:19 -0000	1.27
***************
*** 303,306 ****
--- 303,310 ----
  	for i in range (5):
  		Button = GemRB.GetControl (Window, i+68)
+ 		if GemRB.IsDraggingItem():
+ 			GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_SECOND)
+ 		else:
+ 			GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
  		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_DRAG_DROP, "OnDragItemGround")
  		Slot = GemRB.GetContainerItem (pc, i+TopIndex)
***************
*** 393,403 ****
  		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_SHIFT_PRESS, "")
  
! 	if itemtype>=0 and GemRB.CanUseItemType(itemtype, SlotType["Type"]):
! 		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_SECOND)
! 	else:
  		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
  
  	if slot_item and (GemRB.GetEquippedQuickSlot (pc)==slot+1 or GemRB.GetEquippedAmmunition (pc)==slot+1):
! 		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_SECOND)
  
  	return
--- 397,407 ----
  		GemRB.SetEvent (Window, Button, IE_GUI_BUTTON_ON_SHIFT_PRESS, "")
  
! 	if (SlotType["Type"]&SLOT_INVENTORY) or not GemRB.CanUseItemType(itemtype, SlotType["Type"]):
  		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_ENABLED)
+ 	else:
+ 		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_SECOND)
  
  	if slot_item and (GemRB.GetEquippedQuickSlot (pc)==slot+1 or GemRB.GetEquippedAmmunition (pc)==slot+1):
! 		GemRB.SetButtonState (Window, Button, IE_GUI_BUTTON_THIRD)
  
  	return