| ... |
... |
@@ -121,6 +121,13 @@ def __init__(self, account: str, jid: JID) -> None: |
|
121
|
121
|
self.correcting: bool = False
|
|
122
|
122
|
self.last_sent_msg: Optional[str] = None
|
|
123
|
123
|
|
|
|
124
|
+ self._groupchat_state = GroupchatState()
|
|
|
125
|
+ self._groupchat_state.connect('join-clicked',
|
|
|
126
|
+ self._on_groupchat_state_join_clicked)
|
|
|
127
|
+ self._groupchat_state.connect('abort-clicked',
|
|
|
128
|
+ self._on_groupchat_state_abort_clicked)
|
|
|
129
|
+ self.xml.conv_view_overlay.add_overlay(self._groupchat_state)
|
|
|
130
|
+
|
|
124
|
131
|
self.roster = GroupchatRoster(self.account, self.room_jid, self)
|
|
125
|
132
|
self.xml.roster_revealer.add(self.roster)
|
|
126
|
133
|
|
| ... |
... |
@@ -138,7 +145,6 @@ def __init__(self, account: str, jid: JID) -> None: |
|
138
|
145
|
|
|
139
|
146
|
self.add_actions()
|
|
140
|
147
|
GLib.idle_add(self.update_actions)
|
|
141
|
|
- self.scale_factor = app.window.get_scale_factor()
|
|
142
|
148
|
|
|
143
|
149
|
if not app.settings.get('hide_groupchat_banner'):
|
|
144
|
150
|
self.xml.banner_eventbox.set_no_show_all(False)
|
| ... |
... |
@@ -196,13 +202,6 @@ def __init__(self, account: str, jid: JID) -> None: |
|
196
|
202
|
|
|
197
|
203
|
self._set_control_inactive()
|
|
198
|
204
|
|
|
199
|
|
- self._groupchat_state = GroupchatState()
|
|
200
|
|
- self._groupchat_state.connect('join-clicked',
|
|
201
|
|
- self._on_groupchat_state_join_clicked)
|
|
202
|
|
- self._groupchat_state.connect('abort-clicked',
|
|
203
|
|
- self._on_groupchat_state_abort_clicked)
|
|
204
|
|
- self.xml.conv_view_overlay.add_overlay(self._groupchat_state)
|
|
205
|
|
-
|
|
206
|
205
|
# Stack
|
|
207
|
206
|
self.xml.stack.show_all()
|
|
208
|
207
|
self.xml.stack.set_visible_child_name('groupchat')
|
| ... |
... |
@@ -565,7 +564,8 @@ def _on_avatar_update(self, |
|
565
|
564
|
self._update_avatar()
|
|
566
|
565
|
|
|
567
|
566
|
def _update_avatar(self) -> None:
|
|
568
|
|
- surface = self.contact.get_avatar(AvatarSize.CHAT, self.scale_factor)
|
|
|
567
|
+ surface = self.contact.get_avatar(
|
|
|
568
|
+ AvatarSize.CHAT, app.window.get_scale_factor())
|
|
569
|
569
|
self.xml.avatar_image.set_from_surface(surface)
|
|
570
|
570
|
|
|
571
|
571
|
def draw_banner_text(self) -> None:
|