1 files changed, 6 insertions, 2 deletions
diff --git a/Theme.py b/Theme.py
index 1b34f06..110ee63 100644
--- a/Theme.py
+++ b/Theme.py
@@ -20,13 +20,17 @@ from sugar.graphics import style
 
 TRANSIMG = '50x50blank-trans.png'
 
+LOGO_WIDTH = 275
+FRAME_COUNT = 14
+
 DESKTOP_WIDTH = gtk.gdk.screen_width()
 DESKTOP_HEIGHT = gtk.gdk.screen_height() - style.LARGE_ICON_SIZE
 
 THUMB_SIZE = min(100, min(DESKTOP_WIDTH, DESKTOP_HEIGHT) / 8)
-SCREEN_SIZE = min(DESKTOP_WIDTH - 275, DESKTOP_HEIGHT) - THUMB_SIZE*2 
 
-FRAME_COUNT = DESKTOP_HEIGHT / THUMB_SIZE*2
+FRAME_COLS = max(1, ((DESKTOP_WIDTH-LOGO_WIDTH) -
+        min(DESKTOP_HEIGHT-THUMB_SIZE, DESKTOP_WIDTH-LOGO_WIDTH)) / THUMB_SIZE)
+
 TAPE_COUNT = (DESKTOP_WIDTH - THUMB_SIZE) / THUMB_SIZE
 
 BORDER_LEFT = 1