From fbb25a1ce65f16e160a489d2697ab7a0485d68de Mon Sep 17 00:00:00 2001
From: Alexander Schwinn <alexxcons@xfce.org>
Date: Thu, 10 Feb 2022 10:21:44 +0000
Subject: [PATCH] Get rid of GtkHeaderBar

---
 src/process-window.c  |  11 +---
 src/process-window.ui | 113 ++++++++++++++++++------------------------
 2 files changed, 48 insertions(+), 76 deletions(-)

diff --git a/src/process-window.c b/src/process-window.c
index 6af7519..36c01ca 100644
--- a/src/process-window.c
+++ b/src/process-window.c
@@ -234,7 +234,6 @@ static void
 xtm_process_window_init (XtmProcessWindow *window)
 {
 	GtkWidget *button;
-	gboolean active;
 
 	window->settings = xtm_settings_get_default ();
 	window->channel = xfconf_channel_new (CHANNEL);
@@ -261,15 +260,6 @@ xtm_process_window_init (XtmProcessWindow *window)
 										G_CALLBACK (xwininfo_clicked_cb), window);
 
 	window->filter_searchbar = GTK_WIDGET (gtk_builder_get_object (window->builder, "filter-searchbar"));
-	button = GTK_WIDGET (gtk_builder_get_object (window->builder, "button-show-filter"));
-	xfconf_g_property_bind (window->channel, SETTING_SHOW_FILTER, G_TYPE_BOOLEAN,
-		G_OBJECT (button), "active");
-	active = xfconf_channel_get_bool (window->channel, SETTING_SHOW_FILTER, FALSE);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), active);
-	gtk_revealer_set_reveal_child (GTK_REVEALER (gtk_bin_get_child (GTK_BIN (window->filter_searchbar))), active);
-	g_object_bind_property (G_OBJECT (gtk_bin_get_child (GTK_BIN (window->filter_searchbar))), "reveal-child",
-													G_OBJECT (button), "active", G_BINDING_BIDIRECTIONAL);
-
 	{
 		GtkWidget *toolitem;
 		guint refresh_rate;
@@ -316,6 +306,7 @@ xtm_process_window_init (XtmProcessWindow *window)
 	g_signal_connect (G_OBJECT(window->filter_entry), "icon-press", G_CALLBACK(filter_entry_icon_pressed_cb), NULL);
 	g_signal_connect (G_OBJECT(window->filter_entry), "changed", G_CALLBACK(filter_entry_keyrelease_handler), window->treeview);
 	gtk_widget_set_tooltip_text (window->filter_entry, _("Filter on process name"));
+	gtk_widget_grab_focus (window->filter_entry);
 }
 
 static void
diff --git a/src/process-window.ui b/src/process-window.ui
index c7416f5..38f54b6 100644
--- a/src/process-window.ui
+++ b/src/process-window.ui
@@ -2,92 +2,73 @@
 <!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
-  <object class="GtkImage" id="image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">xc_crosshair</property>
-  </object>
-  <object class="GtkImage" id="image2">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">preferences-system-symbolic</property>
-  </object>
-  <object class="GtkImage" id="image3">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">edit-find-symbolic</property>
-  </object>
   <object class="GtkWindow" id="process-window">
     <property name="can_focus">False</property>
+    <property name="title" translatable="yes">Task Manager</property>
     <property name="icon_name">org.xfce.taskmanager</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="title" translatable="yes">Task Manager</property>
-        <property name="has_subtitle">False</property>
-        <property name="show_close_button">True</property>
-        <child>
-          <object class="GtkButton" id="button-settings">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Settings</property>
-            <property name="image">image2</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button-identify">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Identify an open window by clicking on it.</property>
-            <property name="image">image1</property>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkToggleButton" id="button-show-filter">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Show/hide process filter</property>
-            <property name="image">image3</property>
-          </object>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
+    <property name="type_hint">normal</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkSearchBar" id="filter-searchbar">
+          <object class="GtkToolbar" id="filter-searchbar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="search_mode_enabled">True</property>
-            <property name="show_close_button">True</property>
+            <property name="show_arrow">False</property>
+            <property name="icon_size">1</property>
             <child>
-              <object class="GtkSearchEntry" id="filter-entry">
+              <object class="GtkToolButton" id="button-settings">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="primary_icon_name">edit-find-symbolic</property>
-                <property name="secondary_icon_name">edit-clear</property>
-                <property name="primary_icon_activatable">False</property>
-                <property name="primary_icon_sensitive">False</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Settings</property>
+                <property name="icon_name">preferences-system-symbolic</property>
               </object>
             </child>
+            <child>
+              <object class="GtkToolButton" id="button-identify">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Identify an open window by clicking on it.</property>
+                <property name="icon_name">xc_crosshair</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToolItem" id="filter-toolitem">
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="border_width">2</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">1</property>
+                    <property name="xscale">0.4</property>
+                    <child>
+                      <object class="GtkSearchEntry" id="filter-entry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="primary_icon_name">edit-find-symbolic</property>
+                        <property name="secondary_icon_name">edit-clear</property>
+                        <property name="primary_icon_activatable">False</property>
+                        <property name="primary_icon_sensitive">False</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">0</property>
           </packing>
         </child>
         <child>