← Back to branch summary

~sil2100/unity/ubuntu_5.14

« back to all changes in this revision

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

  • Committer: Didier Roche
  • Date: 2012-04-27 11:42:56 UTC
  • mfrom: (55.813.22)
  • Revision ID: didier.roche@canonical.com-20120427114256-26mtuce24s904wo0
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/UnityShowdesktopHandler.cpp
51
51
    return false;
52
52
 
53
53
  if (wi->Hidden())
54
 
    if ((wi->ShowDesktopMode() || wi->Shaded()))
 
54
    if ((wi->ShowDesktopMode() || wi->Shaded() || wi->Minimized()))
55
55
      return false;
56
56
 
57
57
  return true;
79
79
  return inhibiting_xid;
80
80
}
81
81
 
82
 
ShowdesktopHandler::ShowdesktopHandler (ShowdesktopHandlerWindowInterface *wi) :
 
82
ShowdesktopHandler::ShowdesktopHandler (ShowdesktopHandlerWindowInterface *wi, compiz::WindowInputRemoverLockAcquireInterface *lock_acquire_interface) :
83
83
  showdesktop_handler_window_interface_ (wi),
84
 
  remover_ (wi->InputRemover()),
 
84
  lock_acquire_interface_ (lock_acquire_interface),
 
85
  remover_(),
85
86
  state_ (StateVisible),
86
87
  progress_ (0.0f)
87
88
{
105
106
  {
106
107
    showdesktop_handler_window_interface_->Hide();
107
108
    showdesktop_handler_window_interface_->NotifyHidden();
108
 
    remover_->save();
109
 
    remover_->remove();
 
109
    remover_ = lock_acquire_interface_->InputRemover();
110
110
 
111
111
    if (std::find (animating_windows.begin(),
112
112
                   animating_windows.end(),
127
127
  {
128
128
    showdesktop_handler_window_interface_->Show();
129
129
    showdesktop_handler_window_interface_->NotifyShown();
130
 
    remover_->restore();
 
130
    remover_.reset();
131
131
 
132
132
    if (std::find (animating_windows.begin(),
133
133
                   animating_windows.end(),
184
184
  /* Ignore sent events from the InputRemover */
185
185
  if (remover_)
186
186
  {
187
 
    remover_->save();
188
 
    remover_->remove();
 
187
    remover_->refresh();
189
188
  }
190
189
}
191
190