Ticket #2143: 0001-more-icon-size-steps-in-spiral.patch

File 0001-more-icon-size-steps-in-spiral.patch, 2.0 KB (added by walter, 14 years ago)

more icon-size steps in sprial

  • src/jarabe/desktop/favoriteslayout.py 

    From 02374fba3b4160a63b131e6ec2ae2fb22408d589 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Tue, 24 Aug 2010 11:03:58 -0400
Subject: [PATCH] more icon-size steps in spiral

---
 src/jarabe/desktop/favoriteslayout.py |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/jarabe/desktop/favoriteslayout.py b/src/jarabe/desktop/favoriteslayout.py
index f4d1494..87130d0 100644
    a b _logger = logging.getLogger('FavoritesLayout') 
    3333
    3434_CELL_SIZE = 4
    3535_BASE_SCALE = 1000
    36 _INTERMEDIATE_B = (style.STANDARD_ICON_SIZE + style.SMALL_ICON_SIZE) / 2
    37 _INTERMEDIATE_A = (style.STANDARD_ICON_SIZE + _INTERMEDIATE_B) / 2
    38 _INTERMEDIATE_C = (_INTERMEDIATE_B + style.SMALL_ICON_SIZE) / 2
     36_INTERMEDIATE_C = (style.STANDARD_ICON_SIZE + style.SMALL_ICON_SIZE) / 2
     37_INTERMEDIATE_A = (style.STANDARD_ICON_SIZE * 2 + _INTERMEDIATE_C) / 3
     38_INTERMEDIATE_E = (_INTERMEDIATE_C + style.SMALL_ICON_SIZE * 2) / 3
     39_INTERMEDIATE_B = (_INTERMEDIATE_A + _INTERMEDIATE_C) / 2
     40_INTERMEDIATE_D = (_INTERMEDIATE_C + _INTERMEDIATE_E) / 2
    3941_ICON_SIZES = [style.MEDIUM_ICON_SIZE, style.STANDARD_ICON_SIZE,
    4042               _INTERMEDIATE_A, _INTERMEDIATE_B, _INTERMEDIATE_C,
    41                style.SMALL_ICON_SIZE]
     43               _INTERMEDIATE_D, _INTERMEDIATE_E, style.SMALL_ICON_SIZE]
    4244
    4345
    4446class FavoritesLayout(gobject.GObject, hippo.CanvasLayout):
    … … _MINIMUM_RADIUS = style.XLARGE_ICON_SIZE / 2 + style.DEFAULT_SPACING + \ 
    193195        style.STANDARD_ICON_SIZE * 2
    194196_MAXIMUM_RADIUS = (gtk.gdk.screen_height() - style.GRID_CELL_SIZE) / 2 - \
    195197        style.STANDARD_ICON_SIZE - style.DEFAULT_SPACING
    196 _ICON_SPACING_FACTORS = [1.5, 1.4, 1.3, 1.2, 1.1, 1.0]
    197 _SPIRAL_SPACING_FACTORS = [1.5, 1.5, 1.5, 1.4, 1.3, 1.2]
     198_ICON_SPACING_FACTORS = [1.5, 1.4, 1.3, 1.2, 1.15, 1.1, 1.05, 1.0]
     199_SPIRAL_SPACING_FACTORS = [1.5, 1.5, 1.5, 1.4, 1.35, 1.3, 1.25, 1.2]
    198200_MIMIMUM_RADIUS_ENCROACHMENT = 0.75
    199201_INITIAL_ANGLE = math.pi
    200202