Rework icon sizing (unfinished, but more or less functional)

1 files changed, 24 insertions, 25 deletions

diff --git a/shell/view/stylesheet.py b/shell/view/stylesheet.py
index 031716b..088875c 100644
--- a/shell/view/stylesheet.py
+++ b/shell/view/stylesheet.py
@@ -19,62 +19,61 @@ import hippo
 
 from sugar.graphics.iconcolor import IconColor
 from sugar.graphics import style
+from sugar.graphics.grid import Grid
 
-frame_ActivityIcon = {
-    'color' : IconColor('white'),
-    'size'  : style.standard_icon_size
-}
+grid = Grid()
 
-frame_ShutdownIcon = {
-    'size' : style.standard_icon_size
+frame_ActivityIcon = {
+    'color'      : IconColor('white'),
+    'box-width'  : grid.dimension(1)
 }
 
 frame_OverlayIcon = {
-    'size' : style.standard_icon_size
+    'box-width'  : grid.dimension(1),
+    'box-height' : grid.dimension(1)
 }
 
 frame_ZoomIcon = {
-    'size' : style.standard_icon_size
+    'box-width'  : grid.dimension(1),
+    'box-height' : grid.dimension(1)
 }
 
 frame_BuddyIcon = {
-    'size' : style.standard_icon_size
+    'box-width'  : grid.dimension(1),
+    'box-height' : grid.dimension(1)
 }
 
 home_MyIcon = {
-    'size' : style.xlarge_icon_size
+    'scale' : style.xlarge_icon_scale
 }
 
 ring_ActivityIcon = {
-    'size'  : style.medium_icon_size
+    'scale' : style.medium_icon_scale
 }
 
 friends_MyIcon = {
-    'size' : style.large_icon_size
+    'scale' : style.large_icon_scale
 }
 
 friends_FriendIcon = {
-    'size' : style.large_icon_size
+    'scale' : style.large_icon_scale
 }
 
 friends_ActivityIcon = {
-    'size' : style.standard_icon_size
+    'scale' : style.standard_icon_scale
 }
 
-clipboard_bubble = {
-    'fill-color'    : 0x646464FF,
-    'stroke-color'    : 0x646464FF,
-    'progress-color': 0x333333FF,
+clipboard_Bubble = {
+    'fill-color'     : 0x646464FF,
+    'stroke-color'   : 0x646464FF,
+    'progress-color' : 0x333333FF,
     'spacing'        : style.space_unit,
     'padding'        : style.space_unit * 1.5
 }
 
-clipboard_menu_item_title = {
-    'xalign': hippo.ALIGNMENT_CENTER,
+clipboard_MenuItem_Title = {
+    'xalign'      : hippo.ALIGNMENT_CENTER,
     'padding-left': 5,
-    'color'     : 0xFFFFFFFF,
-    'font'     : style.get_font_description('Bold', 1.2)
+    'color'       : 0xFFFFFFFF,
+    'font'        : style.get_font_description('Bold', 1.2)
 }
-
-style.register_stylesheet("clipboard.Bubble", clipboard_bubble)
-style.register_stylesheet("clipboard.MenuItem.Title", clipboard_menu_item_title)