Daniel Brötzmann pushed to branch newcontrol at gajim / gajim

Commits: 527de18a by wurstsalat at 2022-07-31T20:04:32+02:00 chore: Control: Remove obsolete overlay from UI file

- - - - - 4486547a by wurstsalat at 2022-07-31T20:13:41+02:00 fix: GroupchatRoster: Hide revealer initially

- - - - -

2 changed files:

- gajim/data/gui/chat_control.ui - gajim/gtk/controls/groupchat.py

Changes:

===================================== gajim/data/gui/chat_control.ui ===================================== @@ -5,43 +5,31 @@ <object class="GtkBox" id="control_box"> <property name="can-focus">True</property> <child> - <object class="GtkOverlay" id="overlay"> - <property name="visible">True</property> - <property name="can-focus">False</property> + <object class="GtkBox" id="conv_view_box"> + <property name="can-focus">True</property> + <property name="margin-start">7</property> + <property name="margin-end">7</property> + <property name="spacing">3</property> <child> - <object class="GtkBox" id="conv_view_box"> - <property name="can-focus">True</property> - <property name="margin-start">7</property> - <property name="margin-end">7</property> - <property name="spacing">3</property> - <child> - <object class="GtkOverlay" id="conv_view_overlay"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="hexpand">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <object class="GtkOverlay" id="conv_view_overlay"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> <child> <placeholder/> </child> </object> <packing> - <property name="index">-1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object>

===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -83,17 +83,17 @@ def __init__(self, account: str, jid: JID) -> None: self._groupchat_state = GroupchatState(self.contact) self.xml.conv_view_overlay.add_overlay(self._groupchat_state)

- self._roster_revealer = Gtk.Revealer() - self.xml.conv_view_box.add(self._roster_revealer) - self.roster = GroupchatRoster(self.account, self.room_jid, self) - self._roster_revealer.add(self.roster) + self.roster.connect('row-activated', self._on_roster_row_activated)

show_roster = app.settings.get('hide_groupchat_occupants_list') + self._roster_revealer = Gtk.Revealer(no_show_all=not show_roster) + self._roster_revealer.add(self.roster) self._roster_revealer.set_reveal_child(show_roster) + self.xml.conv_view_box.add(self._roster_revealer) + app.settings.connect_signal( 'hide_groupchat_occupants_list', self._show_roster) - self.roster.connect('row-activated', self._on_roster_row_activated)

self._subject_text = ''

@@ -149,6 +149,8 @@ def invite(self, invited_jid: JID) -> None: def _show_roster(self, show_roster: bool, *args: Any) -> None: transition = Gtk.RevealerTransitionType.SLIDE_RIGHT if show_roster: + self._roster_revealer.set_no_show_all(False) + self._roster_revealer.show_all() transition = Gtk.RevealerTransitionType.SLIDE_LEFT self._roster_revealer.set_transition_type(transition) self._roster_revealer.set_reveal_child(show_roster)

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/7f9a2d1395af3f534b7107300453632a...