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

Commits: 25088a13 by wurstsalat at 2022-07-08T19:03:35+02:00 Move Separators to ChatStack

- - - - -

4 changed files:

- gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/style/gajim.css - gajim/gtk/chat_stack.py

Changes:

===================================== gajim/data/gui/chat_control.ui ===================================== @@ -16,12 +16,6 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child> <object class="GtkOverlay" id="conv_view_overlay"> <property name="visible">True</property> @@ -36,23 +30,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <style> - <class name="chatcontrol-separator"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="index">-1</property>

===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -71,12 +71,6 @@ <property name="margin-end">4</property> <property name="hexpand">True</property> <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child> <object class="GtkOverlay" id="conv_view_overlay"> <property name="visible">True</property> @@ -91,23 +85,6 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <style> - <class name="chatcontrol-separator"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property>

===================================== gajim/data/style/gajim.css ===================================== @@ -6,7 +6,7 @@ .chatcontrol-actionbar-button { border: none; }

-.message-action-box { margin: 0px 13px 8px 8px } +.message-action-box { margin: 8px 13px 8px 8px }

.no-border { border: none; } .scrolled-no-border { border: none; }

===================================== gajim/gtk/chat_stack.py ===================================== @@ -60,6 +60,7 @@ def __init__(self): box.add(self._chat_banner) box.add(Gtk.Separator()) box.add(self._control_stack) + box.add(Gtk.Separator()) box.add(self._message_action_box)

self._current_contact = None

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/25088a135b0299352e33d625808ebcede...