From 661a3025f364cf2ba4fbc351ef50e15941fdae41 Mon Sep 17 00:00:00 2001
From: wurstsalat <mailtrash@posteo.de>
Date: Sat, 28 May 2022 21:01:45 +0200
Subject: [PATCH] imprv: Unify ContactInfo and GroupchatDetails elements width

---
 gajim/data/gui/contact_info.ui  | 6 ++++++
 gajim/gtk/contact_info.py       | 2 +-
 gajim/gtk/contact_settings.py   | 2 +-
 gajim/gtk/groupchat_details.py  | 3 ++-
 gajim/gtk/groupchat_settings.py | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/gajim/data/gui/contact_info.ui b/gajim/data/gui/contact_info.ui
index 3f7e1e69ff..1cf81fe3be 100644
--- a/gajim/data/gui/contact_info.ui
+++ b/gajim/data/gui/contact_info.ui
@@ -409,6 +409,9 @@
                     </child>
                   </object>
                 </child>
+                <style>
+                  <class name="padding-18"/>
+                </style>
               </object>
               <packing>
                 <property name="name">information</property>
@@ -711,6 +714,9 @@
                     </child>
                   </object>
                 </child>
+                <style>
+                  <class name="padding-18"/>
+                </style>
               </object>
               <packing>
                 <property name="name">settings</property>
diff --git a/gajim/gtk/contact_info.py b/gajim/gtk/contact_info.py
index 0c9873d6b0..9ade9c795d 100644
--- a/gajim/gtk/contact_info.py
+++ b/gajim/gtk/contact_info.py
@@ -93,7 +93,7 @@ def __init__(self,
         self._tasks: list[Task] = []
         self._devices: dict[str, DeviceGrid] = {}
 
-        self._switcher = SideBarSwitcher()
+        self._switcher = SideBarSwitcher(width=250)
         self._switcher.set_stack(self._ui.main_stack, rows_visible=False)
         self._ui.main_grid.attach(self._switcher, 0, 0, 1, 1)
         self._ui.main_stack.connect('notify::visible-child-name',
diff --git a/gajim/gtk/contact_settings.py b/gajim/gtk/contact_settings.py
index 09c7335fcd..b47c5275f9 100644
--- a/gajim/gtk/contact_settings.py
+++ b/gajim/gtk/contact_settings.py
@@ -27,9 +27,9 @@
 class ContactSettings(SettingsBox):
     def __init__(self, account: str, jid: JID) -> None:
         SettingsBox.__init__(self, account, str(jid))
-
         self.get_style_context().add_class('settings-border')
         self.set_selection_mode(Gtk.SelectionMode.NONE)
+        self.set_size_request(700, -1)
         self.set_valign(Gtk.Align.START)
         self.set_halign(Gtk.Align.CENTER)
 
diff --git a/gajim/gtk/groupchat_details.py b/gajim/gtk/groupchat_details.py
index df37256c2c..45dd6bef53 100644
--- a/gajim/gtk/groupchat_details.py
+++ b/gajim/gtk/groupchat_details.py
@@ -62,7 +62,7 @@ def __init__(self,
         self._ui = get_builder('groupchat_details.ui')
         self._ui.connect_signals(self)
 
-        self._switcher = SideBarSwitcher()
+        self._switcher = SideBarSwitcher(width=250)
         self._switcher.set_stack(self._ui.main_stack)
         self._ui.main_grid.attach(self._switcher, 0, 0, 1, 1)
         self._ui.main_stack.connect('notify::visible-child-name',
@@ -148,6 +148,7 @@ def _add_groupchat_info(self) -> None:
 
     def _add_groupchat_settings(self) -> None:
         main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=24)
+        main_box.get_style_context().add_class('padding-18')
 
         settings_box = GroupChatSettings(self.account, self._contact.jid)
         main_box.add(settings_box)
diff --git a/gajim/gtk/groupchat_settings.py b/gajim/gtk/groupchat_settings.py
index aa495398fa..6669d1e49c 100644
--- a/gajim/gtk/groupchat_settings.py
+++ b/gajim/gtk/groupchat_settings.py
@@ -27,9 +27,9 @@
 class GroupChatSettings(SettingsBox):
     def __init__(self, account: str, jid: JID) -> None:
         SettingsBox.__init__(self, account, str(jid))
-
         self.get_style_context().add_class('settings-border')
         self.set_selection_mode(Gtk.SelectionMode.NONE)
+        self.set_size_request(700, -1)
         self.set_valign(Gtk.Align.START)
         self.set_halign(Gtk.Align.CENTER)
 
-- 
GitLab