[Amsn-commits] SF.net SVN: amsn: [8958] branches/0_97/amsn/smileys.tcl

[<th...@us...>]

Revision: 8958
          http://amsn.svn.sourceforge.net/amsn/?rev=8958&view=rev
Author:   thaven
Date:     2007-08-21 06:24:24 -0700 (Tue, 21 Aug 2007)

Log Message:
-----------
To branch: fixes for smiley menu (trunk rev. 8914, 8915, 8918)

Modified Paths:
--------------
    branches/0_97/amsn/smileys.tcl

Modified: branches/0_97/amsn/smileys.tcl
===================================================================
--- branches/0_97/amsn/smileys.tcl	2007-08-21 13:10:33 UTC (rev 8957)
+++ branches/0_97/amsn/smileys.tcl	2007-08-21 13:24:24 UTC (rev 8958)
@@ -460,7 +460,7 @@
 		
 		#Now add custom emotions bindings
 		global custom_emotions
-		foreach name [array names custom_emotions] {
+		foreach name [lsort [array names custom_emotions]] {
 			array set emotion $custom_emotions($name)
 			set symbol [string map { % %% } [lindex $emotion(text) 0]]
 			
@@ -483,7 +483,18 @@
 			incr temp
 		}
 
-		moveinscreen $w 5
+	   	# Here, I disable the "Leave" event so that in case the window 
+		# is in the upper left corner and really small, when we click, 
+		# and the mouse is already inside the window, we don't want the
+		# 'moveinscreen' to generate a <Leave> event and thus making it
+		# impossible to show the smiley window
+
+		set binding [bind $w <Leave>]
+		bind $w <Leave> ""
+
+ 		moveinscreen $w 5
+ 		
+		bind $w <Leave> $binding
 		
 		event generate $w <Enter>
 	
@@ -718,7 +729,7 @@
 		
 		#Now add custom emotions
 		global custom_emotions
-		foreach name [array names custom_emotions] {
+		foreach name [lsort [array names custom_emotions]] {
 		
 			array set emotion $custom_emotions($name)
 			if {![info exists emotion(animated)]} { set emotion(animated) 0 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.