Ctrl-Q does not kill Journal, #4644
This commit is contained in:
parent
ef3fe93985
commit
a8193296dd
@ -222,9 +222,16 @@ class Shell(gobject.GObject):
|
|||||||
activity.get_window().activate(1)
|
activity.get_window().activate(1)
|
||||||
|
|
||||||
def close_current_activity(self):
|
def close_current_activity(self):
|
||||||
|
if self._model.get_zoom_level() != ShellModel.ZOOM_ACTIVITY:
|
||||||
|
return
|
||||||
|
|
||||||
|
home_model = self._model.get_home()
|
||||||
|
activity = home_model.get_active_activity()
|
||||||
|
if activity.get_type() == 'org.laptop.JournalActivity':
|
||||||
|
return
|
||||||
|
|
||||||
self.take_activity_screenshot()
|
self.take_activity_screenshot()
|
||||||
if self._model.get_zoom_level() == ShellModel.ZOOM_ACTIVITY:
|
self.get_current_activity().close()
|
||||||
self.get_current_activity().close()
|
|
||||||
|
|
||||||
def get_current_activity(self):
|
def get_current_activity(self):
|
||||||
return self._current_host
|
return self._current_host
|
||||||
|
Loading…
Reference in New Issue
Block a user