Merge lp:~azzar1/unity/fix-973386 into lp:unity

[Andrea Azzarone]

The keyboard shortcuts overlay bottom is truncated.

== Problem ==
The keyboard shortcuts overlay bottom is truncated. I think that this regression is due to Ubuntu fonts updates.

== Fix ==
Make the size of the shortcut overlay more dynamic.

== Test ==
Manual test added. Removed an obsolete AP test too.

This branch is partially inspired by https://code.launchpad.net/~3v1n0/unity/unity-dialog. Kudos to Marco Trevisan :)

UNBLOCK

[Tim Penhey (thumper)]

Appears to work.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Cool.

=== added file 'manual-tests/ShortcutsOverlay.txt'
--- manual-tests/ShortcutsOverlay.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/ShortcutsOverlay.txt	2012-04-10 22:26:19 +0000
@@ -0,0 +1,14 @@
+The keyboard shortcuts overlay bottom is truncated
+---------------------------
+This test ensures that the keyboard shortcuts overlay bottom is not truncated.
+(see lp:973386)
+
+Setup:
+#. Make sure you have a monitor with a resoultion bigger than 1024x768.
+
+Action:
+#. Move your mouse in that monitor.
+#. Press "Super" key.
+
+Outcome:
+  The keyboard shortcuts overlay bottom is not truncated.

=== modified file 'plugins/unityshell/src/ShortcutController.cpp'
--- plugins/unityshell/src/ShortcutController.cpp	2012-03-29 05:14:03 +0000
+++ plugins/unityshell/src/ShortcutController.cpp	2012-04-10 22:26:19 +0000
@@ -109,18 +109,22 @@
     view_->background_color = bg_color_;
 }
 
-void Controller::Show()
+bool Controller::Show()
 {
   if (show_timer_)
-    g_source_remove (show_timer_);
+    g_source_remove(show_timer_);
+  show_timer_ = 0;
 
   if (enabled_)
   {
     show_timer_ = g_timeout_add(SUPER_TAP_DURATION, &Controller::OnShowTimer, this);
     model_->Fill();
     visible_ = true;
+
+    return true;
   }
 
+  return false;
 }
 
 gboolean Controller::OnShowTimer(gpointer data)
@@ -132,14 +136,15 @@
     return FALSE;
   }
 
-  if (!self->view_window_)
-    self->ConstructView();
+  self->EnsureView();
 
-  self->ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+  nux::Geometry geo;
+  if (!self->view_->GetBaseGeometry(geo))
+    return FALSE;
+  self->view_window_->SetGeometry(geo);
 
   if (self->visible_)
   {
-    self->view_window_->SetGeometry(self->workarea_);
     self->view_->SetupBackground(true);
     self->fade_out_animator_.Stop();
     self->fade_in_animator_.Start(self->view_window_->GetOpacity());
@@ -167,17 +172,26 @@
     view_window_->SetBackgroundColor(nux::Color(0x00000000));
   }
 
-  main_layout_->AddView(view_.GetPointer(), 1);
+  main_layout_->AddView(view_.GetPointer());
 
   view_->SetupBackground(false);
   view_window_->SetOpacity(0.0);
   view_window_->ShowWindow(true);
 }
 
-void Controller::SetWorkspace(nux::Geometry const& geo)
-{
-  workarea_ = geo;
-}
+void Controller::EnsureView()
+{
+  if (!view_window_)
+    ConstructView();
+}
+
+void Controller::SetAdjustment(int x, int y)
+{
+  EnsureView();
+
+  view_->SetAdjustment(x, y);
+}
+
 
 void Controller::Hide()
 {
@@ -215,6 +229,9 @@
   enabled_ = enabled;
 }
 
+//
+// Introspection
+//
 std::string Controller::GetName() const
 {
   return "ShortcutController";
@@ -223,7 +240,6 @@
 void Controller::AddProperties(GVariantBuilder* builder)
 {
   unity::variant::BuilderWrapper(builder)
-  .add(workarea_)
   .add("timeout_duration", SUPER_TAP_DURATION + FADE_DURATION)
   .add("enabled", IsEnabled())
   .add("about_to_show", (Visible() && !fade_out_animator_.IsRunning() && view_window_ && view_window_->GetOpacity() != 1.0f))

=== modified file 'plugins/unityshell/src/ShortcutController.h'
--- plugins/unityshell/src/ShortcutController.h	2012-03-29 05:14:03 +0000
+++ plugins/unityshell/src/ShortcutController.h	2012-04-10 22:26:19 +0000
@@ -48,13 +48,13 @@
   ~Controller();
 
   // Public Methods
-  void Show();
+  bool Show();
   void Hide();
 
   bool Visible();
   bool IsEnabled();
 
-  void SetWorkspace(nux::Geometry const& geo);
+  void SetAdjustment(int x, int y);
   void SetEnabled(bool enabled);
 
 protected:
@@ -64,6 +64,7 @@
 private:
   // Private Methods
   void ConstructView();
+  void EnsureView();
   void OnBackgroundUpdate(GVariant* data);
   void OnFadeInUpdated(double opacity);
   void OnFadeInEnded();

=== modified file 'plugins/unityshell/src/ShortcutView.cpp'
--- plugins/unityshell/src/ShortcutView.cpp	2012-04-03 19:29:13 +0000
+++ plugins/unityshell/src/ShortcutView.cpp	2012-04-10 22:26:19 +0000
@@ -25,6 +25,7 @@
 
 #include "LineSeparator.h"
 #include "StaticCairoText.h"
+#include "UScreen.h"
 
 namespace unity
 {
@@ -66,6 +67,8 @@
 
 View::View()
   : ui::UnityWindowView()
+  , x_adjustment_(0)
+  , y_adjustment_(0)
 {
   layout_ = new nux::VLayout();
   layout_->SetPadding(50, 38);
@@ -113,6 +116,33 @@
   return model_;
 }
 
+void View::SetAdjustment(int x, int y)
+{
+  x_adjustment_ = x;
+  y_adjustment_ = y;
+}
+
+bool View::GetBaseGeometry(nux::Geometry& geo)
+{
+  UScreen* uscreen = UScreen::GetDefault();
+  int primary_monitor = uscreen->GetMonitorWithMouse();
+  auto monitor_geo = uscreen->GetMonitorGeometry(primary_monitor);
+
+  int w = GetAbsoluteWidth();
+  int h = GetAbsoluteHeight();
+
+  if (x_adjustment_ + w > monitor_geo.width ||
+      y_adjustment_ + h > monitor_geo.height)
+    return false;
+
+  geo.width = w;
+  geo.height = h;
+
+  geo.x = monitor_geo.x + x_adjustment_ + (monitor_geo.width - geo.width -  x_adjustment_) / 2;
+  geo.y = monitor_geo.y + y_adjustment_ + (monitor_geo.height - geo.height -  y_adjustment_) / 2;
+  return true;
+}
+
 nux::LinearLayout* View::CreateSectionLayout(const char* section_name)
 {
   nux::VLayout* layout = new nux::VLayout(NUX_TRACKER_LOCATION);

=== modified file 'plugins/unityshell/src/ShortcutView.h'
--- plugins/unityshell/src/ShortcutView.h	2012-04-03 19:20:08 +0000
+++ plugins/unityshell/src/ShortcutView.h	2012-04-10 22:26:19 +0000
@@ -48,6 +48,8 @@
   ~View();
 
   // Public methods
+  bool GetBaseGeometry(nux::Geometry&);
+  void SetAdjustment(int x, int y);
   void SetModel(Model::Ptr model);
   Model::Ptr GetModel();
 
@@ -70,6 +72,9 @@
   nux::VLayout* layout_;
   nux::HLayout* columns_layout_;
   std::vector<nux::VLayout*> columns_;
+
+  int x_adjustment_;
+  int y_adjustment_;
 };
 
 } // namespace shortcut

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-04-10 04:03:33 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-04-10 22:26:19 +0000
@@ -1560,32 +1560,15 @@
 
   if (!shortcut_controller_->Visible() && shortcut_controller_->IsEnabled())
   {
-    static nux::Geometry last_geo;
-    UScreen* uscreen = UScreen::GetDefault();
-    int primary_monitor = uscreen->GetMonitorWithMouse();
-    auto monitor_geo = uscreen->GetMonitorGeometry(primary_monitor);
-
-    int width = 970;
-    int height =  680;
     int launcher_width = optionGetIconSize() + 18;
     int panel_height = panel_style_.panel_height;
-    int x = monitor_geo.x + launcher_width + (monitor_geo.width - launcher_width- width) / 2;
-    int y = monitor_geo.y + panel_height + (monitor_geo.height - panel_height - height) / 2;
-
-    nux::Geometry geo (x, y, width, height);
-
-    if (last_geo != geo)
-    {
-      shortcut_controller_->SetWorkspace(geo);
-      last_geo = geo;
-    }
-
-    if (last_geo.x > monitor_geo.x and last_geo.y > monitor_geo.y)
-    {
+
+    if (shortcut_controller_->Show())
+    {
+      shortcut_controller_->SetAdjustment(launcher_width, panel_height);
       EnableCancelAction(CancelActionTarget::SHORTCUT_HINT, true, action->key().modifiers());
-      shortcut_controller_->Show();
     }
-   }
+  }
 
   return true;
 }

=== modified file 'tests/autopilot/autopilot/tests/test_shortcut_hint.py'
--- tests/autopilot/autopilot/tests/test_shortcut_hint.py	2012-04-02 20:18:58 +0000
+++ tests/autopilot/autopilot/tests/test_shortcut_hint.py	2012-04-10 22:26:19 +0000
@@ -103,17 +103,6 @@
         sleep(self.shortcut_hint.get_show_timeout())
         self.assertThat(self.shortcut_hint.is_visible(), Equals(False))
 
-    def test_shortcut_hint_geometries(self):
-        """Test that the shortcut hint has the wanted geometries."""
-        sleep(.5)
-        self.shortcut_hint.show()
-        self.addCleanup(self.shortcut_hint.hide)
-        sleep(self.shortcut_hint.get_show_timeout())
-
-        (x, y, w, h) = self.shortcut_hint.get_geometry()
-        self.assertThat(w, Equals(self.DEFAULT_WIDTH))
-        self.assertThat(h, Equals(self.DEFAULT_HEIGHT))
-
 
 class ShortcutHintInteractionsTests(BaseShortcutHintTests):
     """Test the shortcuthint interactions with other Unity parts."""