[Gemrb-commits] gemrb: branch master updated. 5874a17c707a2151c1042de14513a0f4f13b2457

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  5874a17c707a2151c1042de14513a0f4f13b2457 (commit)
       via  c4f3d25b7281a08fd38860628f2cd54e494190eb (commit)

Summary of changes:
 gemrb/GUIScripts/iwd/GUICommonWindows.py |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)
      from  7f87cc5f58f6116338358b34d378562ee706993f (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=5874a17c707a2151c1042de14513a0f4f13b2457

commit 5874a17c707a2151c1042de14513a0f4f13b2457
Author: Jaka Kranjc <lyn...@us...>
Date:   Tue Jun 29 13:24:05 2010 +0200

    iwd: more gcw syncing with bg2 - actonpc and dragging

diff --git a/gemrb/GUIScripts/iwd/GUICommonWindows.py b/gemrb/GUIScripts/iwd/GUICommonWindows.py
index 37f2962..84ccf9a 100644
--- a/gemrb/GUIScripts/iwd/GUICommonWindows.py
+++ b/gemrb/GUIScripts/iwd/GUICommonWindows.py
@@ -634,6 +634,13 @@ def PortraitButtonOnDrag ():
 def PortraitButtonOnPress ():
 	i = GemRB.GetVar ("PressedPortrait")
 
+	if not i:
+		return
+
+	if GemRB.GameControlGetTargetMode() != TARGET_MODE_NONE:
+		GemRB.ActOnPC (i)
+		return
+
 	if (not SelectionChangeHandler):
 		if GemRB.GameIsPCSelected (i):
 			GemRB.GameControlSetScreenFlags (SF_CENTERONACTOR, OP_OR)
@@ -647,6 +654,9 @@ def PortraitButtonOnPress ():
 def PortraitButtonOnShiftPress ():
 	i = GemRB.GetVar ("PressedPortrait")
 
+	if not i:
+		return
+
 	if (not SelectionChangeHandler):
 		sel = GemRB.GameIsPCSelected (i)
 		sel = not sel
@@ -720,8 +730,13 @@ def CheckDragging():
 
 def PortraitButtonOnMouseLeave ():
 	i = GemRB.GetVar ("PressedPortrait")
-	Button = PortraitWindow.GetControl (i)
+	if not i:
+		return
+
+	Button = PortraitWindow.GetControl (i-1)
 	Button.EnableBorder (FRAME_PC_TARGET, 0)
+	GemRB.SetVar ("PressedPortrait", 0)
+	GemRB.SetTimedEvent (CheckDragging, 1)
 	return
 
 def ActionStopPressed ():

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

commit c4f3d25b7281a08fd38860628f2cd54e494190eb
Author: Jaka Kranjc <lyn...@us...>
Date:   Tue Jun 29 13:23:30 2010 +0200

    iwd: treat the portrait selection the same as bg2 when dragging them

diff --git a/gemrb/GUIScripts/iwd/GUICommonWindows.py b/gemrb/GUIScripts/iwd/GUICommonWindows.py
index 435dabb..37f2962 100644
--- a/gemrb/GUIScripts/iwd/GUICommonWindows.py
+++ b/gemrb/GUIScripts/iwd/GUICommonWindows.py
@@ -620,7 +620,7 @@ def UpdatePortraitWindow ():
 		HPLabel = Window.GetControl (100+portid)
 		HPLabel.SetText (ratio_str) # TODO: color depending on the ratio
 
-		Button.EnableBorder (FRAME_PC_SELECTED, sel)
+		#Button.EnableBorder (FRAME_PC_SELECTED, sel)
 	return
 
 def PortraitButtonOnDrag ():

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


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