From 50e4b82f18059448e9dcbb1f2f5facff16ed8128 Mon Sep 17 00:00:00 2001
From: Skyler Lehmkuhl <skycooler@gmail.com>
Date: Tue, 11 Sep 2012 17:27:35 -0400
Subject: [PATCH] Added scaling to all four corners.

---
 lightningbeam.py | 10 +++++-----
 svlgui.py        | 11 ++++++++++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lightningbeam.py b/lightningbeam.py
index 0dae3e8..6c41eaa 100755
--- a/lightningbeam.py
+++ b/lightningbeam.py
@@ -163,11 +163,11 @@ def onMouseDragObj(self, x, y):
 		self.x = x-self.initx
 		self.y = y-self.inity
 	elif svlgui.MODE=="s":
-		print ((self.maxx/2.0+self.minx)-x)/(self.maxx/2.0)
-		self.xscale = ((self.maxx/2.0+self.minx)-x)/(self.maxx/2.0)
-		self.yscale = ((self.maxy/2.0+self.miny)-y)/(self.maxy/2.0)
-		# self.x = (self.x+self.maxx/2)-((self.maxx/2)*self.xscale)
-		# self.yscale = y/100.0
+		if svlgui.SCALING:
+			self.xscale = ((self.maxx/2.0+self.minx)-x)/(self.maxx/2.0)
+			self.yscale = ((self.maxy/2.0+self.miny)-y)/(self.maxy/2.0)
+			# self.x = (self.x+self.maxx/2)-((self.maxx/2)*self.xscale)
+			# self.yscale = y/100.0
 def onMouseDragText(self, x, y):
 	self.x = x-self.initx
 	self.y = y-self.inity
diff --git a/svlgui.py b/svlgui.py
index 001f908..159042b 100644
--- a/svlgui.py
+++ b/svlgui.py
@@ -2369,7 +2369,15 @@ class Group (object):
 			else:
 				if MODE in [" ", "s", "b"]:
 					if self.activelayer.currentselect and MODE=="s":
-						if self.activelayer.currentselect.minx-5<x<self.activelayer.currentselect.minx+5:
+						global SCALING
+						if (self.activelayer.currentselect.minx-5<x<self.activelayer.currentselect.minx+5 and \
+						 		self.activelayer.currentselect.miny-5<y<self.activelayer.currentselect.miny+5) or \
+						(self.activelayer.currentselect.minx-5<x<self.activelayer.currentselect.minx+5 and \
+								self.activelayer.currentselect.miny+self.activelayer.currentselect.maxy-5<y<self.activelayer.currentselect.miny+self.activelayer.currentselect.maxy+5) or \
+						(self.activelayer.currentselect.minx+self.activelayer.currentselect.maxx-5<x<self.activelayer.currentselect.minx+self.activelayer.currentselect.maxx+5 and \
+								self.activelayer.currentselect.miny+self.activelayer.currentselect.maxy-5<y<self.activelayer.currentselect.miny+self.activelayer.currentselect.maxy+5) or \
+						(self.activelayer.currentselect.minx+self.activelayer.currentselect.maxx-5<x<self.activelayer.currentselect.minx+self.activelayer.currentselect.maxx+5 and \
+								self.activelayer.currentselect.miny-5<y<self.activelayer.currentselect.miny+5):
 							SCALING = True
 					else:
 						test = False
@@ -2389,6 +2397,7 @@ class Group (object):
 	def onMouseDown(self, self1, x, y):
 		pass 
 	def _onMouseUp(self,x,y):
+		global SCALING
 		SCALING = False
 		x, y = self.localtransform(x, y)
 		if self.activelayer.level and MODE in [" ", "s"]: