Ticket #2235: 0001-updated-Ring-view-layout-details.patch

src/jarabe/desktop/favoriteslayout.py

@@ -33 +33 @@
 
 _CELL_SIZE = 4
 _BASE_SCALE = 1000
-_INTERMEDIATE_B = (style.STANDARD_ICON_SIZE + style.SMALL_ICON_SIZE) / 2
-_INTERMEDIATE_A = (style.STANDARD_ICON_SIZE + _INTERMEDIATE_B) / 2
-_INTERMEDIATE_C = (_INTERMEDIATE_B + style.SMALL_ICON_SIZE) / 2
-_ICON_SIZES = [style.MEDIUM_ICON_SIZE, style.STANDARD_ICON_SIZE,
-               _INTERMEDIATE_A, _INTERMEDIATE_B, _INTERMEDIATE_C,
-               style.SMALL_ICON_SIZE]
-
 
 class FavoritesLayout(gobject.GObject, hippo.CanvasLayout):
     """Base class of the different layout types."""
@@ -189 +182 @@
     def allow_dnd(self):
         return True
 
+
 _MINIMUM_RADIUS = style.XLARGE_ICON_SIZE / 2 + style.DEFAULT_SPACING + \
         style.STANDARD_ICON_SIZE * 2
 _MAXIMUM_RADIUS = (gtk.gdk.screen_height() - style.GRID_CELL_SIZE) / 2 - \
         style.STANDARD_ICON_SIZE - style.DEFAULT_SPACING
-_ICON_SPACING_FACTORS = [1.5, 1.4, 1.3, 1.2, 1.1, 1.0]
-_SPIRAL_SPACING_FACTORS = [1.5, 1.5, 1.5, 1.4, 1.3, 1.2]
-_MIMIMUM_RADIUS_ENCROACHMENT = 0.75
-_INITIAL_ANGLE = math.pi
+_INTERMEDIATE_C = (style.STANDARD_ICON_SIZE + style.SMALL_ICON_SIZE) / 2
+_INTERMEDIATE_A = (style.STANDARD_ICON_SIZE * 2 + _INTERMEDIATE_C) / 3
+_INTERMEDIATE_E = (_INTERMEDIATE_C + style.SMALL_ICON_SIZE * 2) / 3
+_INTERMEDIATE_B = (_INTERMEDIATE_A + _INTERMEDIATE_C) / 2
+_INTERMEDIATE_D = (_INTERMEDIATE_C + _INTERMEDIATE_E) / 2
+_ICON_SIZES = [style.MEDIUM_ICON_SIZE, style.STANDARD_ICON_SIZE,
+               _INTERMEDIATE_A, _INTERMEDIATE_B, _INTERMEDIATE_C,
+               _INTERMEDIATE_D, _INTERMEDIATE_E, style.SMALL_ICON_SIZE]
+_ICON_SPACING_FACTORS = [1.5, 1.4, 1.3, 1.2, 1.15, 1.1, 1.05, 1.0]
 
 
 class RingLayout(FavoritesLayout):
-    """Lay out icons in a ring or spiral around the XO man."""
+    """Lay out icons in a ring around the XO man."""
 
     __gtype_name__ = 'RingLayout'
     icon_name = 'view-radial'
@@ -214 +213 @@
     def __init__(self):
         FavoritesLayout.__init__(self)
         self._locked_children = {}
-        self._spiral_mode = False
 
     def append(self, icon, locked=False):
         FavoritesLayout.append(self, icon, locked)
@@ -235 +233 @@
             self._locked_children[child] = (x, y)
 
     def _calculate_radius_and_icon_size(self, children_count):
-        """ Adjust the ring or spiral radius and icon size as needed. """
-        self._spiral_mode = False
+        """ Adjust the ring radius and icon size as needed. """
+        # Begin by increasing the radius.
         distance = style.MEDIUM_ICON_SIZE + style.DEFAULT_SPACING * \
             _ICON_SPACING_FACTORS[_ICON_SIZES.index(style.MEDIUM_ICON_SIZE)]
         radius = max(children_count * distance / (2 * math.pi), _MINIMUM_RADIUS)
         if radius < _MAXIMUM_RADIUS:
             return radius, style.MEDIUM_ICON_SIZE
 
-        distance = style.STANDARD_ICON_SIZE + style.DEFAULT_SPACING * \
-            _ICON_SPACING_FACTORS[_ICON_SIZES.index(style.STANDARD_ICON_SIZE)]
-        radius = max(children_count * distance / (2 * math.pi), _MINIMUM_RADIUS)
-        if radius < _MAXIMUM_RADIUS:
-            return radius, style.STANDARD_ICON_SIZE
-
-        self._spiral_mode = True
-        icon_size = style.STANDARD_ICON_SIZE
-        angle, radius = self._calculate_angle_and_radius(children_count,
-                                                               icon_size)
-        while radius > _MAXIMUM_RADIUS:
-            i = _ICON_SIZES.index(icon_size)
-            if i < len(_ICON_SIZES) - 1:
-                icon_size = _ICON_SIZES[i + 1]
-                angle, radius = self._calculate_angle_and_radius(
-                    children_count, icon_size)
-            else:
-                break
+        # Continue by shrinking the icon size to STANDARD_ICON_SIZE.
+        radius = _MAXIMUM_RADIUS
+        distance = radius * (2 * math.pi) / children_count
+        icon_size = int(distance - style.DEFAULT_SPACING * \
+            _ICON_SPACING_FACTORS[_ICON_SIZES.index(style.STANDARD_ICON_SIZE)])
+        if icon_size >= style.STANDARD_ICON_SIZE:
+            return radius, icon_size
+
+        # Continue by shrinking the icon size to SMALL_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):
-        """ Calculate an icon position on a circle or a spiral. """
+        """ Calculate an icon position on a circle. """
         width, height = self.box.get_allocation()
-        if self._spiral_mode:
-            min_width_, box_width = self.box.get_width_request()
-            min_height_, box_height = self.box.get_height_request(box_width)
-            angle, radius = self._calculate_angle_and_radius(icon_index,
-                                                             icon_size)
-            x, y = self._convert_from_polar_to_cartesian(angle, radius,
-                                                         icon_size,
-                                                         width, height)
-        else:
-            angle = icon_index * (2 * math.pi / children_count) - math.pi / 2
-            x = radius * cos(angle) + (width - icon_size) / 2
-            y = radius * sin(angle) + (height - icon_size - \
+        angle = icon_index * (2 * math.pi / children_count) - math.pi / 2
+        x = radius * cos(angle) + (width - icon_size) / 2
+        y = radius * sin(angle) + (height - icon_size - \
                                        (style.GRID_CELL_SIZE / 2)) / 2
         return x, y
 
-    def _convert_from_polar_to_cartesian(self, angle, radius, icon_size, width,
-                                         height):
-        """ Convert angle, radius to x, y """
-        x = int(math.sin(angle) * radius)
-        y = int(math.cos(angle) * radius)
-        x = - x + (width - icon_size) / 2
-        y = y + (height - icon_size - (style.GRID_CELL_SIZE / 2)) / 2
-        return x, y
-
-    def _calculate_angle_and_radius(self, icon_count, icon_size):
-        """ Based on icon_count and icon_size, calculate radius and angle. """
-        spiral_spacing = _SPIRAL_SPACING_FACTORS[_ICON_SIZES.index(icon_size)]
-        icon_spacing = icon_size + style.DEFAULT_SPACING * \
-            _ICON_SPACING_FACTORS[_ICON_SIZES.index(icon_size)]
-        angle = _INITIAL_ANGLE
-        radius = _MINIMUM_RADIUS - (icon_size * _MIMIMUM_RADIUS_ENCROACHMENT)
-        for i in range(icon_count):
-            circumference = radius * 2 * math.pi
-            n = circumference / icon_spacing
-            angle += (2 * math.pi / n)
-            radius += (float(icon_spacing) * spiral_spacing / n)
-        return angle, radius
-
     def _get_children_in_ring(self):
         children_in_ring = [child for child in self.box.get_layout_children() \
                 if child not in self._locked_children]
@@ -351 +311 @@
         else:
             return 0
 
+
 _SUNFLOWER_CONSTANT = style.STANDARD_ICON_SIZE * .75
 """Chose a constant such that STANDARD_ICON_SIZE icons are nicely spaced."""