# HG changeset patch # User Goffi # Date 1580156228 -3600 # Node ID 816a0c880f52c16e9d70778971db021fe25eae97 # Parent e1f56257cabc226cef50641c5604e2e24aa716e1 core: use selected widget from main screen in getWidgetToSwitch: if we are not on "main" screen, selected_widget may not refer to a widget that we want to change. To avoid that, getWidgetToSwitch check and use `_selected_widget_main` if suitable. In other words, a widget from "main" screen will be returned and switched, even if we are on a other screen (e.g. if on "extra", if a widget like ShareWidget is shown). diff -r e1f56257cabc -r 816a0c880f52 cagou/core/cagou_main.py --- a/cagou/core/cagou_main.py Mon Jan 27 21:17:08 2020 +0100 +++ b/cagou/core/cagou_main.py Mon Jan 27 21:17:08 2020 +0100 @@ -873,7 +873,10 @@ @return (CagouWidget): widget to switch """ - if self.selected_widget is not None: + if self._selected_widget_main is not None: + # we are not on the main screen, we want to switch a widget from main screen + return self._selected_widget_main + elif self.selected_widget is not None: return self.selected_widget # no widget is selected we check if we have any default widget default_cls = self.default_class