From 5419a68413e9de99b3ffe475aaec822378245c51 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@member.fsf.org>
Date: Tue, 20 Jan 2009 23:17:40 +0000
Subject: ...

---
diff --git a/Main.py b/Main.py
index 2f6daaf..bc56e03 100644
--- a/Main.py
+++ b/Main.py
@@ -336,13 +336,15 @@ class CartoonBuilder:
 
         from math import ceil
 
-        rows = int(ceil(float(Theme.FRAME_COUNT)/Theme.FRAME_COLS))
+        rows = max((DESKTOP_HEIGHT - THUMB_SIZE*3) / THUMB_SIZE,
+                int(ceil(float(FRAME_COUNT) / FRAME_COLS)))
+
         self.table = gtk.Table(rows, columns=Theme.FRAME_COLS, homogeneous=False)
 
         for y in range(rows):
             for x in range(Theme.FRAME_COLS):
                 image = gtk.Image()
-                #image.set_from_pixbuf(Document.thumb(i))
+                image.set_from_pixbuf(Document.thumb(0))
                 image.show()
 
                 image_box = gtk.EventBox()
@@ -360,27 +362,10 @@ class CartoonBuilder:
 
         self.table.show()
 
-
         s = VScrolledBox()
         s.show()
         s.set_viewport(self.table)
-
-        s.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(BACKGROUND))
-
-
-        s.modify_fg(gtk.STATE_NORMAL, gtk.gdk.color_parse(BACKGROUND))
-        s.modify_fg(gtk.STATE_ACTIVE, gtk.gdk.color_parse(BACKGROUND))
-        s.modify_fg(gtk.STATE_PRELIGHT, gtk.gdk.color_parse(BACKGROUND))
-        s.modify_fg(gtk.STATE_SELECTED, gtk.gdk.color_parse(BACKGROUND))
-        s.modify_fg(gtk.STATE_INSENSITIVE, gtk.gdk.color_parse(BACKGROUND))
-
-
         s.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse(BUTTON_BACKGROUND))
-        s.modify_bg(gtk.STATE_ACTIVE, gtk.gdk.color_parse(BUTTON_BACKGROUND))
-        s.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.color_parse(BUTTON_BACKGROUND))
-        s.modify_bg(gtk.STATE_SELECTED, gtk.gdk.color_parse(BUTTON_BACKGROUND))
-        s.modify_bg(gtk.STATE_INSENSITIVE, gtk.gdk.color_parse(BUTTON_BACKGROUND))
-
 
         yellow_frames = gtk.EventBox()
         yellow_frames.modify_bg(gtk.STATE_NORMAL,gtk.gdk.color_parse(YELLOW))
@@ -396,10 +381,12 @@ class CartoonBuilder:
 
 
 
+        """
         self.tfhbox = gtk.HBox()
         self.tfhbox.show()
         #self.tfhbox.pack_start(yellow_frames,True,False,20)
         #self.tvbox.pack_start(self.tfhbox,False,False,0)
+        """
         
 
 
@@ -509,7 +496,19 @@ class CartoonBuilder:
         cetralbox = gtk.HBox()
         cetralbox.show()
         cetralbox.pack_start(screen_alignment, True, True)
-        cetralbox.pack_start(yellow_frames, False, False)
+
+
+
+
+
+
+
+        #s.set_size_request(-1, Theme.THUMB_SIZE * rows)
+
+        #a = gtk.Alignment(0.5, 0.5, 0, 0)
+        #a.add(s)#yellow_frames)
+
+        cetralbox.pack_start(yellow_frames, True, False)
 
         hdesktop = gtk.HBox()
         hdesktop.show()
diff --git a/Utils.py b/Utils.py
index c5844ca..a816bb9 100644
--- a/Utils.py
+++ b/Utils.py
@@ -210,16 +210,10 @@ class ScrolledBox(gtk.EventBox):
         gtk.EventBox.modify_fg(self, state, bg)
         self._viewport.get_parent().modify_fg(state, bg)
 
-        self._scrolled.modify_fg(state, bg)
-        self._scrolled.child.modify_fg(state, bg)
-
     def modify_bg(self, state, bg):
         gtk.EventBox.modify_bg(self, state, bg)
         self._viewport.get_parent().modify_bg(state, bg)
 
-        self._scrolled.modify_bg(state, bg)
-        self._scrolled.child.modify_bg(state, bg)
-
     def set_viewport(self, widget):
         if widget == self._viewport: return
         if self._viewport and self._aviewport_sig:
--
cgit v0.9.1