# HG changeset patch
# User Drew Perttula <drewp@bigasterisk.com>
# Date 2007-06-15 21:51:51
# Node ID a13f2caf6f256f1a70a857beef178f7eddfab145
# Parent  546e01adad37bd5a24ec96150b57458782feab0b

fix SC dragging after you load a sub

diff --git a/bin/subcomposer b/bin/subcomposer
--- a/bin/subcomposer
+++ b/bin/subcomposer
@@ -86,7 +86,7 @@ class Subcomposer(tk.Frame):
     def loadsub(self, subname):
         """puts a sub into the levels, replacing old level values"""
         s=Submaster.Submasters().get_sub_by_name(subname)
-        self.levels[:]=s.get_dmx_list()
+        self.set_levels(s.get_dmx_list())
         dispatcher.send("levelchanged")
     def sendupdate(self):
         if not self.dmxdummy:
@@ -100,7 +100,8 @@ class Subcomposer(tk.Frame):
         if use_after_loop:
             self.after(use_after_loop, self.considersendupdate, use_after_loop)
     def set_levels(self, levels):
-        self.levels[:] = levels
+        oldLen = len(self.levels)
+        self.levels[:] = levels + [0] * (oldLen - len(levels))
         dispatcher.send("levelchanged")
 
 class EntryCommand(tk.Frame):
diff --git a/light9/uihelpers.py b/light9/uihelpers.py
--- a/light9/uihelpers.py
+++ b/light9/uihelpers.py
@@ -57,8 +57,8 @@ def toplevelat(name, existingtoplevel=No
 
 def positionOnCurrentDesktop(xform, screenWidth=1920, screenHeight=1440):
     size, x, y = xform.split('+')
-    x = int(x) % 1920
-    y = int(y) % 1440
+    x = int(x) % screenWidth
+    y = int(y) % screenHeight
     return "%s+%s+%s" % (size, x, y)