diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2013-03-04 22:24:47 +0100 |
|---|---|---|
| committer | Andrea Azzarone <azzaronea@gmail.com> | 2013-03-04 22:24:47 +0100 |
| commit | 36d123690652162cde41001b27736d93eb37aa4b (patch) | |
| tree | 7354dafe7b3f36e4ac59df04a484de6ab0108f12 /dash | |
| parent | 7041181c7e4e16d6777c64ed712c653e4eef2d10 (diff) | |
Fix bug 1136447.
(bzr r3183.1.1)
Diffstat (limited to 'dash')
| -rw-r--r-- | dash/DashController.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/dash/DashController.cpp b/dash/DashController.cpp index 13a92d434..d19116042 100644 --- a/dash/DashController.cpp +++ b/dash/DashController.cpp @@ -165,7 +165,9 @@ void Controller::RegisterUBusInterests() unity::glib::String overlay_identity; gboolean can_maximise = FALSE; gint32 overlay_monitor = 0; - g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING, &overlay_identity, &can_maximise, &overlay_monitor); + int width = 0; + int height = 0; + g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING, &overlay_identity, &can_maximise, &overlay_monitor, &width, &height); // hide if something else is coming up if (overlay_identity.Str() != "dash") @@ -314,7 +316,9 @@ void Controller::ShowDash() StartShowHideTimeline(); - GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, monitor_); + nux::Geometry const& view_content_geo = view_->GetContentGeometry(); + + GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, monitor_, view_content_geo.width, view_content_geo.height); ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info); } @@ -363,7 +367,9 @@ void Controller::HideDash(bool restore) StartShowHideTimeline(); - GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, monitor_); + nux::Geometry const& view_content_geo = view_->GetContentGeometry(); + + GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, monitor_, view_content_geo.width, view_content_geo.height); ubus_manager_.SendMessage(UBUS_OVERLAY_HIDDEN, info); } |