Merge lp://qastaging/~unity-team/unity/unity.fix-741657 into lp://qastaging/unity

On Thu, 31 Mar 2011 00:27:20 you wrote:
> Mirco Müller has proposed merging lp:~unity-team/unity/unity.fix-741657
> into lp:unity.
>
> Requested reviews:
> Unity Team (unity-team)
> Related bugs:
> Bug #741657 in unity: "quicklist key-nav needs to ignore separator items"
> https://bugs.launchpad.net/unity/+bug/741657
>
> For more details, see:
> https://code.launchpad.net/~unity-team/unity/unity.fix-741657/+merge/55517
>
> Skip over separator items in Quicklists, if walking them with
> keyboard-navigation. Fixes LP: #741657

How about adding a method like like:

bool menu_item_is_seperator(int index) const
{
  DbusmenuMenuitem* item = GetNthItems(index)->_menuItem;
  const gchar* label = dbusmenu_menuitem_property_get(
      item, DBUSMENU_MENUITEM_PROP_LABEL);
  return label != 0;
}

Then you can use it in the up and down code:

     case NUX_VK_UP:
       if (_current_item_index > 0)
       {
         GetNthItems (_current_item_index)->_prelight = false;
         --_current_item_index;
         while (menu_item_is_seperator(_current_item_index)
         {
           --_current_item_index;
         }
         GetNthItems (_current_item_index)->_prelight = true;
         QueueDraw ();
       }

This makes the code in the case a little easier to understand.

Made code more readable.

Does this handle the case where the last or first item is a separator?

On Fri, 01 Apr 2011 08:41:06 you wrote:
> Review: Needs Information
> Does this handle the case where the last or first item is a separator?

Not very well in the original form.

I does... now :)

Doh... need to remerge with trunk.

Ok, everything is in order again.

Looks better now!