Unity

Merge lp:~bregma/unity/lp-860970-trusty into lp:unity/7.2

  1. lp-860970-trusty
  2. Merge into trusty
Proposed by Stephen M. Webb
Status: Merged
Approved by: Christopher Townsend
Approved revision: no longer in the source branch.
Merged at revision: 3813
Proposed branch: lp:~bregma/unity/lp-860970-trusty
Merge into: lp:unity/7.2
Diff against target: 42 lines (+7/-10)
1 file modified
plugins/unityshell/src/unityshell.cpp (+7/-10)
To merge this branch: bzr merge lp:~bregma/unity/lp-860970-trusty
Reviewer Review Type Date Requested Status
Christopher Townsend Approve
Review via email: mp+252649@code.launchpad.net

Commit message

enable Dash, Hud, and session dialogs over full screen window

Description of the change

Enables Dash, Hud, and session dialogs even if there is a full screen window.

To post a comment you must log in.
Revision history for this message
Christopher Townsend (townsend) wrote :

Yep

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2014-12-16 19:27:36 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2015-03-11 20:04:40 +0000
4@@ -958,6 +958,9 @@
5 {
6 return !allowWindowPaint ||
7 lockscreen_controller_->IsLocked() ||
8+ (dash_controller_->IsVisible() && !nux::GetGraphicsDisplay()->PointerIsGrabbed()) ||
9+ hud_controller_->IsVisible() ||
10+ session_controller_->Visible() ||
11 ((switcher_controller_->Visible() ||
12 WindowManager::Default().IsExpoActive())
13 && !fullscreen_windows_.empty () && (!(screen->grabbed () && !screen->otherGrabExist (NULL))));
14@@ -2116,14 +2119,11 @@
15
16 if (!dash_controller_->IsVisible())
17 {
18- if (!adapter.IsTopWindowFullscreenOnMonitorWithMouse())
19+ if (dash_controller_->ShowDash())
20 {
21- if (dash_controller_->ShowDash())
22- {
23- tap_handled = true;
24- ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
25- g_variant_new("(sus)", "home.scope", dash::GOTO_DASH_URI, ""));
26- }
27+ tap_handled = true;
28+ ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
29+ g_variant_new("(sus)", "home.scope", dash::GOTO_DASH_URI, ""));
30 }
31 }
32 else
33@@ -2524,9 +2524,6 @@
34 {
35 auto& wm = WindowManager::Default();
36
37- if (wm.IsTopWindowFullscreenOnMonitorWithMouse())
38- return false;
39-
40 if (wm.IsScreenGrabbed())
41 {
42 hud_ungrab_slot_ = wm.screen_ungrabbed.connect([this] { ShowHud(); });

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: