← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/unityshell.cpp

  • Committer: Andrea Azzarone
  • Date: 2014-12-19 02:46:37 UTC
  • mto: This revision was merged to the branch mainline in revision 3905.
  • Revision ID: azzaronea@gmail.com-20141219024637-w6s2zy5ffvc7y1d7
Enable dash and hud if there is a fullscreen window.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/unityshell.cpp
961
961
{
962
962
  return !allowWindowPaint ||
963
963
         lockscreen_controller_->IsLocked() ||
 
964
         dash_controller_->IsVisible() ||
 
965
         hud_controller_->IsVisible() ||
964
966
          ((switcher_controller_->Visible() ||
965
967
            WindowManager::Default().IsExpoActive())
966
968
           && !fullscreen_windows_.empty () && (!(screen->grabbed () && !screen->otherGrabExist (NULL))));
2119
2121
 
2120
2122
    if (!dash_controller_->IsVisible())
2121
2123
    {
2122
 
      if (!adapter.IsTopWindowFullscreenOnMonitorWithMouse())
 
2124
      if (dash_controller_->ShowDash())
2123
2125
      {
2124
 
        if (dash_controller_->ShowDash())
2125
 
        {
2126
 
          tap_handled = true;
2127
 
          ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
2128
 
                                    g_variant_new("(sus)", "home.scope", dash::GOTO_DASH_URI, ""));
2129
 
        }
 
2126
        tap_handled = true;
 
2127
        ubus_manager_.SendMessage(UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
 
2128
                                  g_variant_new("(sus)", "home.scope", dash::GOTO_DASH_URI, ""));
2130
2129
      }
2131
2130
    }
2132
2131
    else
2537
2536
 
2538
2537
    auto& wm = WindowManager::Default();
2539
2538
 
2540
 
    if (wm.IsTopWindowFullscreenOnMonitorWithMouse())
2541
 
      return false;
2542
 
 
2543
2539
    if (wm.IsScreenGrabbed())
2544
2540
    {
2545
2541
      hud_ungrab_slot_ = wm.screen_ungrabbed.connect([this] { ShowHud(); });