Merge lp:~haggai-eran/unity/rtl-menu-popup into lp:unity

[Haggai Eran]

Hi,

These patches should make the menus in the unity menu bar and in the indicators open to the left when using a right-to-left locale. In a right-to-left setting, the menus should open that way so that they are aligned to the right with the label of the menu or the indicator icon.

The patches change the unity service to show menus to the left of the coordinates given when using an RTL locale. It also changes unity panel to send the coordinates of the bottom right corner of the indicator label, instead of the bottom left. A similar patch was proposed for unity-2d at lp:~haggai-eran/unity-2d/4.0-rtl.

The branch depends on some changes I've proposed to the nux library, at lp:~haggai-eran/nux/rtl.

[Alex Launi (alexlauni)]

Please add tests that prove this behaves correctly.

review: Needs Fixing

[Haggai Eran (haggai-eran)]

Hi Alex,

Thanks for your comment. I'm wondering what tests would be suitable. Most of the changes in this branch are visual: opening the menu to the left, instead of to the right. One change that seems more suitable to automated testing is the keyboard navigation change, which makes the right key navigate to the previous menu, instead of to the next menu. I could add a test that checks this. Should that test be under tests/unit/TestPanelService.cpp?

[Alex Launi (alexlauni)]

Sounds right

[Stephen M. Webb (bregma)]

Although this functional change is desirable, the merge proposal has grown stale.

I'm rejecting it for now. Please re-propose if you are still actively proposing it.

[Haggai Eran (haggai-eran)]

That's fine. Without the nux RTL patches these patches won't work anyway.

I don't have much time these days to work on updating these patches. If I ever will I'll re-propose.

Unmerged revisions

1374. By Haggai Eran on 2011-08-13

Correct navigation in the menu when using keyboard on a right-to-left locale.

1373. By Haggai Eran on 2011-08-13

Open popup menus from the bottom-right point when using a right-to-left locale.

1372. By Haggai Eran on 2011-08-13

Align popup menus to the left when in right-to-left locale.

=== modified file 'plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp'
--- plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp	2011-08-03 11:37:28 +0000
+++ plugins/unityshell/src/PanelIndicatorObjectEntryView.cpp	2011-08-15 10:35:29 +0000
@@ -97,7 +97,10 @@
        (proxy_->image_visible() && proxy_->image_sensitive())) &&
       nux::GetEventButton(button_flags) != 2)
   {
-    proxy_->ShowMenu(GetAbsoluteX() + 1, //cairo translation
+    int left = GetAbsoluteX() + 1; //cairo translation
+    if (GetDirection() == nux::RightToLeft)
+      left = left + GetGeometry().width;
+    proxy_->ShowMenu(left,
                      GetAbsoluteY() + PANEL_HEIGHT,
                      time(NULL),
                      nux::GetEventButton(button_flags));
@@ -140,7 +143,10 @@
 
 void PanelIndicatorObjectEntryView::Activate()
 {
-  proxy_->ShowMenu(GetAbsoluteGeometry().x + 1, //cairo translation FIXME: Make this into one function
+  int left = GetAbsoluteX() + 1; //cairo translation FIXME: Make this into one function
+  if (GetDirection() == nux::RightToLeft)
+    left = left + GetGeometry().width;
+  proxy_->ShowMenu(left,
                    GetAbsoluteGeometry().y + PANEL_HEIGHT,
                    time(NULL),
                    1);

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-08-11 07:58:12 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-08-15 10:35:29 +0000
@@ -137,6 +137,8 @@
   StartupNotifyService::Default()->SetSnDisplay(screen->snDisplay(), screen->screenNum());
 
   nux::NuxInitialize(0);
+  nux::SetDefaultDirection(gtk_widget_get_default_direction() == GTK_TEXT_DIR_RTL ? 
+    nux::RightToLeft : nux::LeftToRight);
   wt = nux::CreateFromForeignWindow(cScreen->output(),
                                     glXGetCurrentContext(),
                                     &UnityScreen::initUnity,

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2011-07-29 07:15:54 +0000
+++ services/panel-service.c	2011-08-15 10:35:29 +0000
@@ -784,6 +784,25 @@
 
   *x = priv->last_x;
   *y = priv->last_y;
+
+  if (gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL)
+  {
+    GtkAllocation size;
+    GtkBorder padding;
+
+    gtk_widget_get_allocation(GTK_WIDGET(menu), &size);
+
+    GtkStyleContext *context;
+    GtkStateFlags state;
+
+    context = gtk_widget_get_style_context (GTK_WIDGET(menu));
+    state = gtk_widget_get_state_flags (GTK_WIDGET(menu));
+
+    gtk_style_context_get_padding (context, state, &padding);
+
+    *x += padding.left - size.width + 1;
+  }
+
   *push = TRUE;
 }
 
@@ -1009,6 +1028,21 @@
       || direction == GTK_MENU_DIR_PREV)
     return;
 
+  // Switch directions for RTL.
+  if (gtk_widget_get_direction(GTK_WIDGET(menu)) == GTK_TEXT_DIR_RTL)
+    {
+      switch (direction)
+        {
+          case GTK_MENU_DIR_CHILD:
+            direction = GTK_MENU_DIR_PARENT;
+            break;
+          case GTK_MENU_DIR_PARENT:
+            direction = GTK_MENU_DIR_CHILD;
+            break;
+          default: ;
+        }
+    }
+
   /* We don't want to distrupt going into submenus */
   if (direction == GTK_MENU_DIR_CHILD)
     {