diff options
| author | fiaxh <git@lightrise.org> | 2024-09-15 20:04:52 +0200 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2024-09-15 20:15:14 +0200 |
| commit | e8f82fd328697542d2ee0233635b694827a5cc79 (patch) | |
| tree | b3fe7981ded0f9d570c64a09494734711035b09c /main/data | |
| parent | 63ba0bc93636de557ced29c19b2b61eeeab57bf8 (diff) | |
| download | dino-e8f82fd328697542d2ee0233635b694827a5cc79.tar.gz dino-e8f82fd328697542d2ee0233635b694827a5cc79.zip | |
Code cleanup: Remove broken disable CSD code
Diffstat (limited to 'main/data')
| -rw-r--r-- | main/data/conversation_list_titlebar.ui | 46 | ||||
| -rw-r--r-- | main/data/conversation_list_titlebar_csd.ui | 33 | ||||
| -rw-r--r-- | main/data/gresource.xml | 1 |
3 files changed, 18 insertions, 62 deletions
diff --git a/main/data/conversation_list_titlebar.ui b/main/data/conversation_list_titlebar.ui index 8fd8605b..afe10926 100644 --- a/main/data/conversation_list_titlebar.ui +++ b/main/data/conversation_list_titlebar.ui @@ -1,43 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk" version="4.0"/> - <template class="DinoUiConversationListTitlebar" parent="GtkBox"> - <property name="hexpand">0</property> + <requires lib="adw" version="1.0"/> + <object class="AdwHeaderBar" id="header_bar"> + <property name="hexpand">False</property> <style> - <class name="dino-header-left"/> + <class name="dino-left"/> </style> <child> - <object class="GtkBox"> - <property name="margin-start">5</property> - <property name="margin-end">5</property> - <property name="margin-top">5</property> - <property name="margin-bottom">5</property> - <property name="hexpand">1</property> + <object class="GtkMenuButton" id="add_button"> + <property name="has-frame">False</property> <child> - <object class="GtkMenuButton" id="add_button"> - <property name="has-frame">False</property> - <child> - <object class="GtkImage"> - <property name="icon-name">list-add-symbolic</property> - <property name="icon-size">normal</property> - </object> - </child> + <object class="GtkImage"> + <property name="icon-name">list-add-symbolic</property> + <property name="icon-size">normal</property> </object> </child> + </object> + </child> + <child type="end"> + <object class="GtkMenuButton" id="menu_button"> + <property name="has-frame">False</property> <child> - <object class="GtkMenuButton" id="menu_button"> - <property name="halign">end</property> - <property name="hexpand">True</property> - <property name="has-frame">False</property> - <child> - <object class="GtkImage"> - <property name="icon-name">open-menu-symbolic</property> - <property name="icon-size">normal</property> - </object> - </child> + <object class="GtkImage"> + <property name="icon-name">open-menu-symbolic</property> + <property name="icon-size">normal</property> </object> </child> </object> </child> - </template> + </object> </interface> diff --git a/main/data/conversation_list_titlebar_csd.ui b/main/data/conversation_list_titlebar_csd.ui deleted file mode 100644 index afe10926..00000000 --- a/main/data/conversation_list_titlebar_csd.ui +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<interface> - <requires lib="gtk" version="4.0"/> - <requires lib="adw" version="1.0"/> - <object class="AdwHeaderBar" id="header_bar"> - <property name="hexpand">False</property> - <style> - <class name="dino-left"/> - </style> - <child> - <object class="GtkMenuButton" id="add_button"> - <property name="has-frame">False</property> - <child> - <object class="GtkImage"> - <property name="icon-name">list-add-symbolic</property> - <property name="icon-size">normal</property> - </object> - </child> - </object> - </child> - <child type="end"> - <object class="GtkMenuButton" id="menu_button"> - <property name="has-frame">False</property> - <child> - <object class="GtkImage"> - <property name="icon-name">open-menu-symbolic</property> - <property name="icon-size">normal</property> - </object> - </child> - </object> - </child> - </object> -</interface> diff --git a/main/data/gresource.xml b/main/data/gresource.xml index 8717fa85..647f5116 100644 --- a/main/data/gresource.xml +++ b/main/data/gresource.xml @@ -15,7 +15,6 @@ <file>conversation_details.ui</file> <file>conversation_item_widget.ui</file> <file>conversation_list_titlebar.ui</file> - <file>conversation_list_titlebar_csd.ui</file> <file>conversation_row.ui</file> <file>conversation_view.ui</file> <file>dino-conversation-list-placeholder-arrow.svg</file> |