[Amsn-commits] SF.net SVN: amsn: [9084] trunk/amsn

[<ba...@us...>]

Revision: 9084
          http://amsn.svn.sourceforge.net/amsn/?rev=9084&view=rev
Author:   baaazen
Date:     2007-11-04 08:16:18 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
fix scaling of smileys mentioned here:
http://www.amsn-project.net/forums/viewtopic.php?p=22601
all outgoing smileys are scaled down and incoming smileys are scaled correctly depending on the option in the preferences

Modified Paths:
--------------
    trunk/amsn/msnp2p.tcl
    trunk/amsn/smileys.tcl

Modified: trunk/amsn/msnp2p.tcl
===================================================================
--- trunk/amsn/msnp2p.tcl	2007-11-04 15:17:19 UTC (rev 9083)
+++ trunk/amsn/msnp2p.tcl	2007-11-04 16:16:18 UTC (rev 9084)
@@ -215,7 +215,9 @@
 			if { [::abook::getContactData $user showcustomsmileys] != 0 } { ::MSNP2P::RequestObject $chatid $user $msnobj }
 		} else {
 			# Make sure the smiley is max 50x50
-			::smiley::resizeCustomSmiley emoticonCustom_std_${filename}
+			if {[::config::getKey big_incoming_smileys 0] == 0} {
+				::smiley::resizeCustomSmiley emoticonCustom_std_${filename}
+			}
 		}
 	}
 
@@ -965,7 +967,9 @@
 								catch {image create photo emoticonCustom_std_${filename} -file "[file join $HOME smileys cache ${filename}.png]" -format cximage}
 								
 								# Make sure the smiley is max 50x50
-								::smiley::resizeCustomSmiley emoticonCustom_std_${filename}
+								if {[::config::getKey big_incoming_smileys 0] == 0} {
+									::smiley::resizeCustomSmiley emoticonCustom_std_${filename}
+								}
 								if { $scrolling } { ::ChatWindow::Scroll $tw }
 							}
 						}

Modified: trunk/amsn/smileys.tcl
===================================================================
--- trunk/amsn/smileys.tcl	2007-11-04 15:17:19 UTC (rev 9083)
+++ trunk/amsn/smileys.tcl	2007-11-04 16:16:18 UTC (rev 9084)
@@ -206,10 +206,8 @@
 			set emotion(preview) [image create photo emoticonCustom_preview_$emotion(text)]
 			$emotion(preview) copy emoticonCustom_std_$emotion(text)
 
-			if {[::config::getKey big_incoming_smileys 0] == 1} {
-				# Make sure the smiley is max 50x50
-				::smiley::resizeCustomSmiley emoticonCustom_std_$emotion(text)
-			}
+			# Make sure the smiley is max 50x50
+			::smiley::resizeCustomSmiley emoticonCustom_std_$emotion(text)
 		}
 		
 		#Store the emoticon data in the custom_emoticons array
@@ -1291,11 +1289,6 @@
 			
 			set smileyIdx [$tw image create $endpos -image "emoticonCustom_std_$file" -padx 0 -pady 0]
 
-			# Make sure the smiley is max 50x50
-		    	if {[::config::getKey big_incoming_smileys 0] == 1} {
-			    ::smiley::resizeCustomSmiley emoticonCustom_std_$file
-			}
-
 			$tw tag add $twTag $smileyIdx
 			$tw tag remove smiley $endpos
 		    


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