Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
ed997562 by wurstsalat at 2021-12-22T00:33:36+01:00
BaseControl: Simplify _allow_add_message
- - - - -
e0e263ef by wurstsalat at 2021-12-22T00:34:56+01:00
BaseControl: Disable reducing message count for now
- - - - -
1 changed file:
- gajim/gtk/controls/base.py
Changes:
=====================================
gajim/gtk/controls/base.py
=====================================
@@ -1128,9 +1128,7 @@ def save_message(self, message: str, msg_type: str) ->
None:
def _allow_add_message(self) -> bool:
# Only add messages if the view is already populated
- chat_loaded = app.window.is_chat_loaded(self.account, self.contact.jid)
- lower_complete = self._scrolled_view.get_lower_complete()
- return chat_loaded and lower_complete
+ return self.is_chat_loaded and self._scrolled_view.get_lower_complete()
def add_info_message(self, text: str) -> None:
self.conversation_view.add_info_message(text)
@@ -1321,7 +1319,6 @@ def update_text_tags(self):
def set_control_active(self, state: bool) -> None:
if not self._chat_loaded:
self.fetch_n_lines_history(self._scrolled_view, True, 20)
- self._chat_loaded = True
if state:
self.set_emoticon_popover()
@@ -1402,6 +1399,8 @@ def fetch_n_lines_history(self,
timestamp,
n_lines)
+ self._chat_loaded = True
+
if not messages:
self._scrolled_view.set_history_complete(before, True)
self.conversation_view.unlock()
@@ -1412,9 +1411,9 @@ def fetch_n_lines_history(self,
if len(messages) < n_lines:
self._scrolled_view.set_history_complete(before, True)
- if self._scrolled_view.get_autoscroll():
- if self.conversation_view.reduce_message_count(before):
- self._scrolled_view.set_history_complete(before, False)
+ # if self._scrolled_view.get_autoscroll():
+ # if self.conversation_view.reduce_message_count(before):
+ # self._scrolled_view.set_history_complete(before, False)
self.conversation_view.unlock()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/528aae4763759fc81fb305cbfa62a02681ec99a1...e0e263efa1b3b08595e3a31beb2ed0fa16478498
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/528aae4763759fc81fb305cbfa62a02681ec99a1...e0e263efa1b3b08595e3a31beb2ed0fa16478498
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
