[Git][gajim/gajim][master] 2 commits: ChatList: Remove the overlay for chat close button - Commits

28 Jan 2022


      Philipp Hörist pushed to branch master at gajim / gajim
Commits:
aa802429 by lovetox at 2022-01-28T23:20:46+01:00
ChatList: Remove the overlay for chat close button
With the overlay the unread counter was often not visible anymore
- - - - -
11b94d48 by lovetox at 2022-01-28T23:21:26+01:00
Update builder types
- - - - -
3 changed files:
- gajim/data/gui/chat_list_row.ui
- gajim/data/style/gajim.css
- gajim/gtk/builder.pyi
Changes:
=====================================
gajim/data/gui/chat_list_row.ui
=====================================
@@ -6,129 +6,87 @@
     <property name="visible">True</property>
     <property name="can-focus">False</property>
     <child>
-      <object class="GtkOverlay" id="overlay">
+      <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <child>
-          <object class="GtkBox">
-            <property name="visible">True</property>
+          <object class="GtkBox" id="account_identifier">
+            <property name="width-request">6</property>
             <property name="can-focus">False</property>
+            <property name="no-show-all">True</property>
+            <property name="margin-end">6</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkBox" id="account_identifier">
-                <property name="width-request">6</property>
-                <property name="can-focus">False</property>
-                <property name="no-show-all">True</property>
-                <property name="margin-end">6</property>
-                <property name="orientation">vertical</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <style>
-                  <class name="account-identifier-bar"/>
-                </style>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkImage" id="avatar_image">
-                <property name="visible">True</property>
-                <property name="can-focus">False</property>
-                <property name="margin-end">12</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
+              <placeholder/>
             </child>
+            <style>
+              <class name="account-identifier-bar"/>
+            </style>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkImage" id="avatar_image">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-end">12</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="margin-end">12</property>
+            <property name="hexpand">True</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <property name="orientation">vertical</property>
+                <property name="spacing">6</property>
                 <child>
                   <object class="GtkBox">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkBox">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="spacing">3</property>
-                        <child>
-                          <object class="GtkImage" id="group_chat_indicator">
-                            <property name="can-focus">False</property>
-                            <property name="no-show-all">True</property>
-                            <property name="icon-name">feather-users-symbolic</property>
-                            <property name="icon_size">1</property>
-                            <style>
-                              <class name="dim-label"/>
-                            </style>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="name_label">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="ellipsize">end</property>
-                            <property name="single-line-mode">True</property>
-                            <property name="xalign">0</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
+                    <property name="spacing">3</property>
                     <child>
-                      <object class="GtkImage" id="chatstate_image">
+                      <object class="GtkImage" id="group_chat_indicator">
                         <property name="can-focus">False</property>
                         <property name="no-show-all">True</property>
-                        <property name="valign">end</property>
-                        <property name="icon-name">content-loading-symbolic</property>
+                        <property name="icon-name">feather-users-symbolic</property>
+                        <property name="icon_size">1</property>
                         <style>
-                          <class name="chatstate-icon"/>
+                          <class name="dim-label"/>
                         </style>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="timestamp_label">
+                      <object class="GtkLabel" id="name_label">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="valign">end</property>
-                        <style>
-                          <class name="small-label"/>
-                          <class name="dim-label"/>
-                        </style>
+                        <property name="halign">start</property>
+                        <property name="ellipsize">end</property>
+                        <property name="single-line-mode">True</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="pack-type">end</property>
-                        <property name="position">2</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
@@ -139,73 +97,73 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkImage" id="chatstate_image">
+                    <property name="can-focus">False</property>
+                    <property name="no-show-all">True</property>
+                    <property name="valign">end</property>
+                    <property name="icon-name">content-loading-symbolic</property>
+                    <style>
+                      <class name="chatstate-icon"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="timestamp_label">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="spacing">3</property>
-                    <child>
-                      <object class="GtkLabel" id="nick_label">
-                        <property name="can-focus">False</property>
-                        <property name="no-show-all">True</property>
-                        <property name="halign">start</property>
-                        <property name="ellipsize">end</property>
-                        <property name="single-line-mode">True</property>
-                        <property name="xalign">0</property>
-                        <style>
-                          <class name="small-label"/>
-                          <class name="dim-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkImage" id="message_icon">
-                        <property name="can-focus">False</property>
-                        <property name="no-show-all">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="message_label">
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="ellipsize">end</property>
-                        <property name="single-line-mode">True</property>
-                        <property name="xalign">0</property>
-                        <style>
-                          <class name="small-label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="unread_label">
-                        <property name="can-focus">False</property>
-                        <property name="no-show-all">True</property>
-                        <style>
-                          <class name="unread-counter"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="pack-type">end</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
+                    <property name="valign">end</property>
+                    <style>
+                      <class name="small-label"/>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="pack-type">end</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="spacing">3</property>
+                <child>
+                  <object class="GtkLabel" id="nick_label">
+                    <property name="can-focus">False</property>
+                    <property name="no-show-all">True</property>
+                    <property name="halign">start</property>
+                    <property name="ellipsize">end</property>
+                    <property name="single-line-mode">True</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="small-label"/>
+                      <class name="dim-label"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="message_icon">
+                    <property name="can-focus">False</property>
+                    <property name="no-show-all">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -213,24 +171,59 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="message_label">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="ellipsize">end</property>
+                    <property name="single-line-mode">True</property>
+                    <property name="xalign">0</property>
+                    <style>
+                      <class name="small-label"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="unread_label">
+                    <property name="can-focus">False</property>
+                    <property name="no-show-all">True</property>
+                    <style>
+                      <class name="unread-counter"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="pack-type">end</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">True</property>
+                <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="index">-1</property>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
           </packing>
         </child>
-        <child type="overlay">
+        <child>
           <object class="GtkRevealer" id="revealer">
             <property name="can-focus">False</property>
             <property name="halign">end</property>
-            <property name="transition-type">crossfade</property>
-            <property name="transition-duration">50</property>
+            <property name="transition-type">slide-right</property>
+            <property name="transition-duration">100</property>
             <child>
               <object class="GtkButton" id="close_button">
                 <property name="visible">True</property>
@@ -248,6 +241,11 @@
               </object>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">3</property>
+          </packing>
         </child>
       </object>
     </child>
=====================================
gajim/data/style/gajim.css
=====================================
@@ -319,7 +319,7 @@ .chatlist {
 }
 .chatlist-row {
     transition: none;
-    padding: 0px;
+    padding: 6px 0px 6px 6px;
     margin-left: 12px;
     margin-right: 12px;
     margin-bottom: 3px;
@@ -337,7 +337,8 @@ .chatlist-row:selected label:not(.unread-counter){
     color: @theme_text_color;
 }
 .chatlist-row button {
-    padding: 3px;
+    min-width: 16px;
+    min-height: 20px;
 }
 .chatlist-row:selected button {
    color: @theme_fg_color;
@@ -346,9 +347,7 @@ .chatlist-row:selected button {
 .chatlist-row:selected image {
    color: @theme_fg_color;
 }
-.chatlist-row overlay > box {
-	padding: 6px;
-}
+
 @keyframes composing {
     0%  {
        -gtk-icon-transform: translate(0px, 2px);
=====================================
gajim/gtk/builder.pyi
=====================================
@@ -225,7 +225,6 @@ class ChatControlBuilder(Builder):
class ChatListRowBuilder(Builder):
     eventbox: Gtk.EventBox
-    overlay: Gtk.Overlay
     account_identifier: Gtk.Box
     avatar_image: Gtk.Image
     group_chat_indicator: Gtk.Image
@@ -407,9 +406,6 @@ class GroupchatControlBuilder(Builder):
     bold: Gtk.MenuItem
     italic: Gtk.MenuItem
     strike: Gtk.MenuItem
-    manage_popover: Gtk.Popover
-    manage_advanced_button: Gtk.Button
-    manage_destroy_button: Gtk.Button
     groupchat_control_hbox: Gtk.Box
     overlay: Gtk.Overlay
     stack: Gtk.Stack
@@ -461,13 +457,6 @@ class GroupchatControlBuilder(Builder):
     destroy_reason_entry: Gtk.Entry
     invite_grid: Gtk.Grid
     invite_button: Gtk.Button
-    avatar_button_image: Gtk.Image
-    avatar_select_button: Gtk.Button
-    muc_description_entry: Gtk.Entry
-    muc_name_entry: Gtk.Entry
-    manage_save_button: Gtk.Button
-    avatar_selector_grid: Gtk.Grid
-    avatar_update_button: Gtk.Button
     visitor_popover: Gtk.Popover
@@ -533,6 +522,7 @@ class GroupchatInviterBuilder(Builder):
class GroupchatManageBuilder(Builder):
+    subject_buffer: Gtk.TextBuffer
     stack: Gtk.Stack
     avatar_button_image: Gtk.Image
     avatar_select_button: Gtk.Button
@@ -543,7 +533,6 @@ class GroupchatManageBuilder(Builder):
     subject_change_button: Gtk.Button
     avatar_selector_grid: Gtk.Grid
     avatar_update_button: Gtk.Button
-    subject_buffer: Gtk.TextBuffer
class GroupchatNickChooserBuilder(Builder):
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/288ab8073a5f9ee654d72f8c6339e46e...
-- 
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/288ab8073a5f9ee654d72f8c6339e46e...
You're receiving this email because of your account on dev.gajim.org.





    