Do not use scrollbox for tape; tapesize is limited by screen width

1 files changed, 6 insertions, 17 deletions

diff --git a/theme.py b/theme.py
index c3b76f9..05ebdc4 100644
--- a/theme.py
+++ b/theme.py
@@ -22,30 +22,19 @@ from sugar.graphics import style
 TRANSIMG = '50x50blank-trans.png'
 
 LOGO_WIDTH = 275
+TAPE_COUNT = 13
 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)
+THUMB_SIZE = min(100, DESKTOP_WIDTH / (TAPE_COUNT+1))
 
 FRAME_COLS = max(1, ((DESKTOP_WIDTH-LOGO_WIDTH) -
-        min(DESKTOP_HEIGHT-THUMB_SIZE, DESKTOP_WIDTH-LOGO_WIDTH)) / THUMB_SIZE)
-
-TAPE_COUNT = 14
-#TAPE_COUNT = (DESKTOP_WIDTH - THUMB_SIZE) / THUMB_SIZE
-
-BORDER_LEFT = 1
-BORDER_RIGHT = 2
-BORDER_TOP = 4
-BORDER_BOTTOM = 8
-BORDER_VERTICAL = BORDER_TOP | BORDER_BOTTOM
-BORDER_HORIZONTAL = BORDER_LEFT | BORDER_RIGHT
-BORDER_ALL = BORDER_VERTICAL | BORDER_HORIZONTAL
-BORDER_ALL_BUT_BOTTOM = BORDER_HORIZONTAL | BORDER_TOP
-BORDER_ALL_BUT_LEFT = BORDER_VERTICAL | BORDER_RIGHT
-
-SLICE_BTN_WIDTH = 40
+        min(DESKTOP_HEIGHT-THUMB_SIZE-THUMB_SIZE/2, DESKTOP_WIDTH-LOGO_WIDTH))
+        / THUMB_SIZE)
+
+BORDER_WIDTH = 10
 
 # Colors from the Rich's UI design