Merge lp:~unity-team/unity/unity.more-visual-quicklist-tweaks into lp:unity

[Mirco Müller]

This branch uses the new (leaner) visuals for checkmark- and radiobutton-items in quicklists. It also indents all items (normal, image, checkmark, radio-button). Due to this and the fact that quicklists are meant to grow out of tooltips, the label of a tooltip is now also indented (balanced with a gap on the right side to... this was done after consulting Design).

Disabled options are not yet covered as their state is currently only map-able to the reactive-flag, which is already used to avoid highlighting the tooltip-label (name of the quicklist) thus users don't expect this entry to be selectable and perform an action.

The new layout of the tooltips, making them denser in appearance, conflicts with the way expand-animations work. Design has not covered that yet. We'll address this after the merge window tomorrow, as it is a very involved issue.

[Neil J. Patel (njpatel)]

Looks good, approved.

review: Approve

=== modified file 'unity-private/launcher/quicklist-check-menu-item.vala'
--- unity-private/launcher/quicklist-check-menu-item.vala	2010-08-05 09:12:34 +0000
+++ unity-private/launcher/quicklist-check-menu-item.vala	2010-08-18 22:36:48 +0000
@@ -55,7 +55,9 @@
                                                  this.label,
                                                  out width,
                                                  out height);
-      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN) + 30.0f;
+      min_width_p = (float) width +
+                    (float) Ctk.em_to_pixel (2 * MARGIN) +
+                    ITEM_INDENT_ABS;
       natural_width_p = min_width_p;
     }
 
@@ -125,15 +127,15 @@
 
       string formatted_label = Utils.strip_characters (label, "", "_", "_");
 
-      //Unity.QuicklistRendering.RadioItem.normal_mask (normal_cr,
-      Unity.QuicklistRendering.CheckmarkItem.normal_mask (normal_cr,
+      Unity.QuicklistRendering.RadioItem.normal_mask (normal_cr,
+      //Unity.QuicklistRendering.CheckmarkItem.normal_mask (normal_cr,
                                                           this.last_width,
                                                           this.last_height,
                                                           settings.gtk_font_name,
                                                           formatted_label,
                                                           active);
-      //Unity.QuicklistRendering.RadioItem.selected_mask (selected_cr,
-      Unity.QuicklistRendering.CheckmarkItem.selected_mask (selected_cr,
+      Unity.QuicklistRendering.RadioItem.selected_mask (selected_cr,
+      //Unity.QuicklistRendering.CheckmarkItem.selected_mask (selected_cr,
                                                             this.last_width,
                                                             this.last_height,
                                                             settings.gtk_font_name,

=== modified file 'unity-private/launcher/quicklist-image-menu-item.vala'
--- unity-private/launcher/quicklist-image-menu-item.vala	2010-08-04 15:59:23 +0000
+++ unity-private/launcher/quicklist-image-menu-item.vala	2010-08-18 22:36:48 +0000
@@ -56,7 +56,9 @@
                                                  this.label,
                                                  out width,
                                                  out height);
-      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN);
+      min_width_p = (float) width +
+                    (float) Ctk.em_to_pixel (2 * MARGIN) +
+                    ITEM_INDENT_ABS;
       natural_width_p = min_width_p;
     }
 

=== modified file 'unity-private/launcher/quicklist-menu-item.vala'
--- unity-private/launcher/quicklist-menu-item.vala	2010-08-04 15:59:23 +0000
+++ unity-private/launcher/quicklist-menu-item.vala	2010-08-18 22:36:48 +0000
@@ -57,7 +57,9 @@
                                                  this.label,
                                                  out width,
                                                  out height);
-      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN);
+      min_width_p = (float) width +
+                    (float) Ctk.em_to_pixel (2 * MARGIN) +
+                    2 * ITEM_INDENT_ABS;
       natural_width_p = min_width_p;
     }
 

=== modified file 'unity-private/launcher/quicklist-radio-menu-item.vala'
--- unity-private/launcher/quicklist-radio-menu-item.vala	2010-08-05 09:12:34 +0000
+++ unity-private/launcher/quicklist-radio-menu-item.vala	2010-08-18 22:36:48 +0000
@@ -55,7 +55,9 @@
                                                  this.label,
                                                  out width,
                                                  out height);
-      min_width_p = (float) width + (float) Ctk.em_to_pixel (2 * MARGIN) + 30.0f;
+      min_width_p = (float) width +
+                    (float) Ctk.em_to_pixel (2 * MARGIN) +
+                    ITEM_INDENT_ABS;
       natural_width_p = min_width_p;
     }
 

=== modified file 'unity-private/launcher/quicklist-view.vala'
--- unity-private/launcher/quicklist-view.vala	2010-08-12 10:07:02 +0000
+++ unity-private/launcher/quicklist-view.vala	2010-08-18 22:36:48 +0000
@@ -34,6 +34,7 @@
   const float ITEM_HEIGHT            = 2.0f;
   const float ITEM_CORNER_RADIUS     = 0.3f;
   const float ITEM_CORNER_RADIUS_ABS = 4.0f;
+  const float ITEM_INDENT_ABS        = 20.0f;
   const float ANCHOR_HEIGHT          = 1.5f;
   const float ANCHOR_HEIGHT_ABS      = 18.0f;
   const float ANCHOR_WIDTH           = 0.75f;

=== modified file 'unity/quicklist-rendering.vala'
--- unity/quicklist-rendering.vala	2010-08-05 08:10:13 +0000
+++ unity/quicklist-rendering.vala	2010-08-18 22:36:48 +0000
@@ -35,6 +35,7 @@
   const float ITEM_HEIGHT            = 2.0f;
   const float ITEM_CORNER_RADIUS     = 0.3f;
   const float ITEM_CORNER_RADIUS_ABS = 4.0f;
+  const float ITEM_INDENT_ABS        = 20.0f;
   const float ANCHOR_HEIGHT          = 1.5f;
   const float ANCHOR_HEIGHT_ABS      = 18.0f;
   const float ANCHOR_WIDTH           = 0.75f;
@@ -202,17 +203,8 @@
 
       // draw checkmark
       cr.save ();
-      cr.translate (_align ((30.0f - 16.0f) / 2.0f),
-                    _align (((double) h - 16.0f) / 2.0f));
-      cr.set_source_rgba (1.0f, 1.0f, 1.0f, 0.65f);
-      _round_rect (cr,
-                   1.0f,   // aspect
-                   0.0f,   // top-left corner
-                   0.0f,   // top-left corner
-                   3.0f,   // "size" of the corners
-                   16.0f,  // width of the rectangle
-                   16.0f); // height of the rectangle
-      cr.stroke ();
+      cr.translate (_align ((ITEM_INDENT_ABS - 16.0f) / 2.0f),
+                    _align (((double) h - 16.0f)/ 2.0f));
 
       cr.set_source_rgba (1.0f, 1.0f, 1.0f, 1.0f);
 
@@ -255,7 +247,7 @@
       int text_width;
       int text_height;
       get_text_extents (font, text, out text_width, out text_height);
-      cr.move_to (30.0f + Ctk.em_to_pixel (MARGIN),
+      cr.move_to (ITEM_INDENT_ABS + Ctk.em_to_pixel (MARGIN),
                   (float) (h - text_height) / 2.0f);
 
       Pango.cairo_show_layout (cr, layout);
@@ -293,18 +285,9 @@
 
       // draw checkmark
       cr.save ();
-      cr.translate (_align ((30.0f - 16.0f) / 2.0f),
+      cr.translate (_align ((ITEM_INDENT_ABS - 16.0f) / 2.0f),
                     _align (((double) h - 16.0f) / 2.0f));
 
-      _round_rect (cr,
-                   1.0f,   // aspect
-                   0.0f,   // top-left corner
-                   0.0f,   // top-left corner
-                   3.0f,   // "size" of the corners
-                   16.0f,  // width of the rectangle
-                   16.0f); // height of the rectangle
-      cr.stroke ();
-
       if (enabled)
         {
           cr.translate (3.0f, 1.0f);
@@ -344,7 +327,7 @@
       int text_width;
       int text_height;
       get_text_extents (font, text, out text_width, out text_height);
-      cr.move_to (30.0f + Ctk.em_to_pixel (MARGIN),
+      cr.move_to (ITEM_INDENT_ABS + Ctk.em_to_pixel (MARGIN),
                   (float) (h - text_height) / 2.0f);
 
       Pango.cairo_show_layout (cr, layout);
@@ -371,7 +354,7 @@
       cr.scale (1.0f, 1.0f);
       cr.set_line_width (1.0f);
 
-      double x  = _align (15.0f);
+      double x  = _align (ITEM_INDENT_ABS / 2.0f);
       double y  = _align ((double) h / 2.0f);
       double r1 = 3.5f;
       double r2 = 8.5f;
@@ -383,17 +366,6 @@
           cr.arc (x, y, r1, 0.0f * (GLib.Math.PI / 180.0f),
                             360.0f * (GLib.Math.PI / 180.0f));
           cr.fill ();
-          cr.set_source_rgba (1.0f, 1.0f, 1.0f, 0.65f);
-          cr.arc (x, y, r2, 0.0f * (GLib.Math.PI / 180.0f),
-                            360.0f * (GLib.Math.PI / 180.0f));
-          cr.stroke ();
-        }
-      else
-        {
-          cr.set_source_rgba (1.0f, 1.0f, 1.0f, 0.65f);
-          cr.arc (x, y, r2, 0.0f * (GLib.Math.PI / 180.0f),
-                            360.0f * (GLib.Math.PI / 180.0f));
-          cr.stroke ();
         }
 
       cr.set_source_rgba (1.0f, 1.0f, 1.0f, 1.0f);
@@ -419,7 +391,7 @@
       int text_width;
       int text_height;
       get_text_extents (font, text, out text_width, out text_height);
-      cr.move_to (30.0f + Ctk.em_to_pixel (MARGIN),
+      cr.move_to (ITEM_INDENT_ABS + Ctk.em_to_pixel (MARGIN),
                   (float) (h - text_height) / 2.0f);
 
       Pango.cairo_show_layout (cr, layout);
@@ -452,7 +424,7 @@
                    h - 1.0f);
       cr.fill ();
 
-      double x  = _align (15.0f);
+      double x  = _align (ITEM_INDENT_ABS / 2.0f);
       double y  = _align ((double) h / 2.0f);
       double r1 = 3.5f;
       double r2 = 8.5f;
@@ -465,16 +437,7 @@
           cr.arc (x, y, r1, 0.0f * (GLib.Math.PI / 180.0f),
                             360.0f * (GLib.Math.PI / 180.0f));
           cr.fill ();
-          cr.arc (x, y, r2, 0.0f * (GLib.Math.PI / 180.0f),
-                            360.0f * (GLib.Math.PI / 180.0f));
-          cr.stroke ();
         }
-      else
-       {
-          cr.arc (x, y, r2, 0.0f * (GLib.Math.PI / 180.0f),
-                            360.0f * (GLib.Math.PI / 180.0f));
-          cr.stroke ();
-       }
 
       // draw text
       Pango.Layout layout = Pango.cairo_create_layout (cr);
@@ -498,7 +461,7 @@
       int text_width;
       int text_height;
       get_text_extents (font, text, out text_width, out text_height);
-      cr.move_to (30.0f + Ctk.em_to_pixel (MARGIN),
+      cr.move_to (ITEM_INDENT_ABS + Ctk.em_to_pixel (MARGIN),
                   (float) (h - text_height) / 2.0f);
 
       Pango.cairo_show_layout (cr, layout);
@@ -543,7 +506,7 @@
       int text_width;
       int text_height;
       get_text_extents (font, text, out text_width, out text_height);
-      cr.move_to (Ctk.em_to_pixel (MARGIN),
+      cr.move_to (ITEM_INDENT_ABS + Ctk.em_to_pixel (MARGIN),
                   (float) (h - text_height) / 2.0f);
 
       Pango.cairo_show_layout (cr, layout);
@@ -597,7 +560,7 @@
       int text_width;
       int text_height;
       get_text_extents (font, text, out text_width, out text_height);
-      cr.move_to (Ctk.em_to_pixel (MARGIN),
+      cr.move_to (ITEM_INDENT_ABS + Ctk.em_to_pixel (MARGIN),
                   (float) (h - text_height) / 2.0f);
 
       cr.set_source_rgba (0.0f, 0.0f, 0.0f, 0.0f);