| ... |
... |
@@ -1128,9 +1128,7 @@ def save_message(self, message: str, msg_type: str) -> None: |
|
1128
|
1128
|
|
|
1129
|
1129
|
def _allow_add_message(self) -> bool:
|
|
1130
|
1130
|
# Only add messages if the view is already populated
|
|
1131
|
|
- chat_loaded = app.window.is_chat_loaded(self.account, self.contact.jid)
|
|
1132
|
|
- lower_complete = self._scrolled_view.get_lower_complete()
|
|
1133
|
|
- return chat_loaded and lower_complete
|
|
|
1131
|
+ return self.is_chat_loaded and self._scrolled_view.get_lower_complete()
|
|
1134
|
1132
|
|
|
1135
|
1133
|
def add_info_message(self, text: str) -> None:
|
|
1136
|
1134
|
self.conversation_view.add_info_message(text)
|
| ... |
... |
@@ -1321,7 +1319,6 @@ def update_text_tags(self): |
|
1321
|
1319
|
def set_control_active(self, state: bool) -> None:
|
|
1322
|
1320
|
if not self._chat_loaded:
|
|
1323
|
1321
|
self.fetch_n_lines_history(self._scrolled_view, True, 20)
|
|
1324
|
|
- self._chat_loaded = True
|
|
1325
|
1322
|
|
|
1326
|
1323
|
if state:
|
|
1327
|
1324
|
self.set_emoticon_popover()
|
| ... |
... |
@@ -1402,6 +1399,8 @@ def fetch_n_lines_history(self, |
|
1402
|
1399
|
timestamp,
|
|
1403
|
1400
|
n_lines)
|
|
1404
|
1401
|
|
|
|
1402
|
+ self._chat_loaded = True
|
|
|
1403
|
+
|
|
1405
|
1404
|
if not messages:
|
|
1406
|
1405
|
self._scrolled_view.set_history_complete(before, True)
|
|
1407
|
1406
|
self.conversation_view.unlock()
|
| ... |
... |
@@ -1412,9 +1411,9 @@ def fetch_n_lines_history(self, |
|
1412
|
1411
|
if len(messages) < n_lines:
|
|
1413
|
1412
|
self._scrolled_view.set_history_complete(before, True)
|
|
1414
|
1413
|
|
|
1415
|
|
- if self._scrolled_view.get_autoscroll():
|
|
1416
|
|
- if self.conversation_view.reduce_message_count(before):
|
|
1417
|
|
- self._scrolled_view.set_history_complete(before, False)
|
|
|
1414
|
+ # if self._scrolled_view.get_autoscroll():
|
|
|
1415
|
+ # if self.conversation_view.reduce_message_count(before):
|
|
|
1416
|
+ # self._scrolled_view.set_history_complete(before, False)
|
|
1418
|
1417
|
|
|
1419
|
1418
|
self.conversation_view.unlock()
|
|
1420
|
1419
|
|