From 88c34ef2b036118fc39908e042ca08725bf619e7 Mon Sep 17 00:00:00 2001 From: Walter Bender Date: Tue, 24 Aug 2010 10:46:22 -0400 Subject: [PATCH] scale icons continously when layout != Ring --- src/jarabe/desktop/favoriteslayout.py | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/jarabe/desktop/favoriteslayout.py b/src/jarabe/desktop/favoriteslayout.py index 4c7444d..f4d1494 100644 --- a/src/jarabe/desktop/favoriteslayout.py +++ b/src/jarabe/desktop/favoriteslayout.py @@ -266,13 +266,12 @@ class RingLayout(FavoritesLayout): children_count, icon_size) else: break - return radius, icon_size else: - distance = style.STANDARD_ICON_SIZE + style.DEFAULT_SPACING * \ - _ICON_SPACING_FACTORS[_ICON_SIZES.index(style.SMALL_ICON_SIZE)] - radius = max(children_count * distance / (2 * math.pi), - _MINIMUM_RADIUS) - return radius, style.SMALL_ICON_SIZE + # Continue by shrinking the icon size. + icon_size = max(int(distance - style.DEFAULT_SPACING * \ + _ICON_SPACING_FACTORS[_ICON_SIZES.index( + style.SMALL_ICON_SIZE)]), style.SMALL_ICON_SIZE) + return radius, icon_size def _calculate_position(self, radius, icon_size, icon_index, children_count, sin=math.sin, cos=math.cos): -- 1.7.0.4