← Back to branch summary

~jincreator/unity/lp1251193

« back to all changes in this revision

Viewing changes to shutdown/SessionController.cpp

UnityScreen: toggle activation of all the unity compiz actions when locking the screen

Also, make sure that the lockscreen views are treated as "always-on-front" windows by nux
(and this applies to both visibility and events).

Show diffs side-by-side

added added

removed removed

Lines of Context:
shutdown/SessionController.cpp
101
101
  view_->live_background = true;
102
102
 
103
103
  view_window_->ShowWindow(true);
104
 
  view_window_->PushToFront();
105
104
  view_window_->SetInputFocus();
 
105
  nux::GetWindowCompositor().SetAlwaysOnFrontWindow(view_window_.GetPointer());
106
106
  nux::GetWindowCompositor().SetKeyFocusArea(view_->key_focus_area());
107
107
  animation::StartOrReverse(fade_animator_, animation::Direction::FORWARD);
108
108
}
175
175
 
176
176
void Controller::Hide()
177
177
{
178
 
  animation::StartOrReverse(fade_animator_, animation::Direction::BACKWARD);
 
178
  if (view_window_)
 
179
    animation::StartOrReverse(fade_animator_, animation::Direction::BACKWARD);
179
180
}
180
181
 
181
182
void Controller::CloseWindow()
182
183
{
183
 
  view_window_->PushToBack();
184
 
  view_window_->ShowWindow(false);
185
184
  view_window_->UnGrabPointer();
186
185
  view_window_->UnGrabKeyboard();
 
186
  view_window_->ShowWindow(false);
187
187
  view_window_->EnableInputWindow(false);
188
 
  view_->live_background = false;
 
188
 
 
189
  view_ = nullptr;
 
190
  view_window_ = nullptr;
189
191
 
190
192
  nux::GetWindowCompositor().SetKeyFocusArea(nullptr);
191
193
  WindowManager::Default().RestoreInputFocus();