Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
915a9f0f by wurstsalat at 2023-05-30T23:26:53+02:00
fix: Fix interaction of GroupchatRoster and SearchView
Fixes #11546
- - - - -
1 changed file:
- gajim/gtk/chat_page.py
Changes:
=====================================
gajim/gtk/chat_page.py
=====================================
@@ -153,7 +153,16 @@ def _on_chat_selected(self,
self._chat_stack.show_chat(account, jid)
- if self._search_revealer.get_reveal_child():
+ if (not self._search_revealer.get_reveal_child() and
+ self._restore_occupants_list and
+ self._chat_control.contact.is_groupchat):
+ # GroupchatRoster was hidden by Search initially, but Search was
+ # afterwards closed in a 1:1 chat. Only restore GroupchatRoster if
+ # a group chat was selected.
+ app.settings.set('hide_groupchat_occupants_list', False)
+ self._restore_occupants_list = False
+
+ if not app.settings.get('hide_groupchat_occupants_list'):
self._search_view.set_context(account, jid)
self.emit('chat-selected', workspace_id, account, jid)
@@ -342,7 +351,11 @@ def hide_search(self) -> bool:
if self._search_revealer.get_reveal_child():
self._search_revealer.set_reveal_child(False)
- if self._restore_occupants_list:
+ if (self._restore_occupants_list and
+ self._chat_control.contact.is_groupchat):
+ # Restore GroupchatRoster only if a group chat is selected
+ # currently. If this condition isn' satisfied, it is checked
+ # again as soon as a chat is selected in _on_chat_selected.
app.settings.set('hide_groupchat_occupants_list', False)
self._restore_occupants_list = False
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/915a9f0fbe638c994de29318bdc26f86588b18ec
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/915a9f0fbe638c994de29318bdc26f86588b18ec
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
