Philipp Hörist pushed to branch gtk4 at gajim / gajim


Commits:
d47049a9 by Philipp Hörist at 2024-10-05T13:38:45+02:00
refactor: Fix Roster

- - - - -
3729cd12 by Philipp Hörist at 2024-10-05T13:38:45+02:00
refactor: Fix Roster

- - - - -


4 changed files:

- gajim/data/gui/groupchat_roster.ui
- gajim/data/gui/roster.ui
- gajim/gtk/groupchat_roster.py
- gajim/gtk/roster.py


Changes:

=====================================
gajim/data/gui/groupchat_roster.ui
=====================================
@@ -82,7 +82,7 @@
                   </object>
                   <attributes>
                     <attribute name="visible">2</attribute>
-                    <attribute name="surface">0</attribute>
+                    <attribute name="texture">0</attribute>
                   </attributes>
                 </child>
                 <child>
@@ -112,7 +112,7 @@
   </object>
   <object class="GtkTreeStore" id="participant_store">
     <columns>
-      <column type="CairoGObjectSurface"/>
+      <column type="GdkTexture"/>
       <column type="gchararray"/>
       <column type="gboolean"/>
       <column type="gchararray"/>


=====================================
gajim/data/gui/roster.ui
=====================================
@@ -3,7 +3,7 @@
   <requires lib="gtk" version="4.0"/>
   <object class="GtkTreeStore" id="contact_store">
     <columns>
-      <column type="CairoGObjectSurface"/>
+      <column type="GdkTexture"/>
       <column type="gchararray"/>
       <column type="gboolean"/>
       <column type="gchararray"/>
@@ -33,7 +33,7 @@
           </object>
           <attributes>
             <attribute name="visible">2</attribute>
-            <attribute name="surface">0</attribute>
+            <attribute name="texture">0</attribute>
           </attributes>
         </child>
         <child>


=====================================
gajim/gtk/groupchat_roster.py
=====================================
@@ -107,7 +107,7 @@ def __init__(self) -> None:
     def _hide_roster(self, hide_roster: bool, *args: Any) -> None:
         transition = Gtk.RevealerTransitionType.SLIDE_RIGHT
         if not hide_roster:
-            self.show_all()
+            self.show()
             transition = Gtk.RevealerTransitionType.SLIDE_LEFT
 
         self.set_transition_type(transition)


=====================================
gajim/gtk/roster.py
=====================================
@@ -154,7 +154,7 @@ def _on_theme_update(self, _event: ApplicationEvent) -> 
None:
 
     @staticmethod
     def _on_drag_drop(treeview: Gtk.TreeView,
-                      drag_context: Gdk.DragContext,
+                      drag_context: Any,
                       _x_coord: int,
                       _y_coord: int,
                       timestamp: int) -> bool:
@@ -167,10 +167,10 @@ def _on_drag_drop(treeview: Gtk.TreeView,
 
     def _on_drag_data_received(self,
                                treeview: Gtk.TreeView,
-                               _drag_context: Gdk.DragContext,
+                               _drag_context: Any,
                                x_coord: int,
                                y_coord: int,
-                               _selection_data: Gtk.SelectionData,
+                               _selection_data: Any,
                                _info: int,
                                _timestamp: int) -> None:
 
@@ -620,7 +620,7 @@ def _draw_contact_row(self,
 
         texture = contact.get_avatar(
             AvatarSize.ROSTER, self.get_scale_factor())
-        # self._store[iter_][Column.AVATAR] = texture
+        self._store[iter_][Column.AVATAR] = texture
         self._store[iter_][Column.VISIBLE] = self._get_contact_visible(contact)
 
     def _get_total_user_count(self) -> int:



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/18fff2b1ebf1b3327295e909c1a6fad76bb472b3...3729cd12fe82c982e7194e8c6988325d95d5d0ca

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/compare/18fff2b1ebf1b3327295e909c1a6fad76bb472b3...3729cd12fe82c982e7194e8c6988325d95d5d0ca
You're receiving this email because of your account on dev.gajim.org.


_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to