From 13293738d5dfa5355e81daf3e687c32de8c4977f Mon Sep 17 00:00:00 2001
From: Bleak Grey <bleakgrey@gmail.com>
Date: Sun, 5 Jul 2020 10:42:00 +0300
Subject: [PATCH] Reparent Status widget to ListBoxRow (#183)

---
 data/ui/widgets/accounts_button.ui |  2 +-
 data/ui/widgets/status.ui          |  4 ++--
 src/API/Account.vala               |  4 +---
 src/API/Status.vala                |  5 +----
 src/Views/Base.vala                |  5 +++++
 src/Views/Search.vala              |  2 --
 src/Widgets/Status.vala            | 32 +++++++++++++++---------------
 7 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/data/ui/widgets/accounts_button.ui b/data/ui/widgets/accounts_button.ui
index 01c2e51..87be52b 100644
--- a/data/ui/widgets/accounts_button.ui
+++ b/data/ui/widgets/accounts_button.ui
@@ -215,7 +215,7 @@
         <child>
           <object class="TootleWidgetsAvatar" id="avatar">
             <property name="visible">True</property>
-            <property name="size">28</property>
+            <property name="size">25</property>
           </object>
           <packing>
             <property name="pass_through">True</property>
diff --git a/data/ui/widgets/status.ui b/data/ui/widgets/status.ui
index 4053284..dc73232 100644
--- a/data/ui/widgets/status.ui
+++ b/data/ui/widgets/status.ui
@@ -22,9 +22,9 @@
     <property name="can_focus">False</property>
     <property name="icon_name">media-playlist-repeat-symbolic</property>
   </object>
-  <template class="TootleWidgetsStatus" parent="GtkEventBox">
+  <template class="TootleWidgetsStatus" parent="GtkListBoxRow">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="activatable">True</property>
     <child>
       <object class="GtkGrid" id="grid">
         <property name="visible">True</property>
diff --git a/src/API/Account.vala b/src/API/Account.vala
index 57eb4dc..2b07c51 100644
--- a/src/API/Account.vala
+++ b/src/API/Account.vala
@@ -39,9 +39,7 @@ public class Tootle.API.Account : Entity, Widgetizable {
 
     public override Gtk.Widget to_widget () {
         var status = new API.Status.from_account (this);
-        var w = new Widgets.Status (status);
-        w.button_press_event.connect (w.open);
-        return w;
+        return new Widgets.Status (status);
     }
 
     public Request get_relationship () {
diff --git a/src/API/Status.vala b/src/API/Status.vala
index 89d3c41..535fa08 100644
--- a/src/API/Status.vala
+++ b/src/API/Status.vala
@@ -73,10 +73,7 @@ public class Tootle.API.Status : Entity, Widgetizable {
 	}
 
     public override Gtk.Widget to_widget () {
-        var w = new Widgets.Status (this);
-        w.button_press_event.connect (w.open);
-
-        return w;
+        return new Widgets.Status (this);
     }
 
     public bool is_owned (){
diff --git a/src/Views/Base.vala b/src/Views/Base.vala
index fd515d8..08b067b 100644
--- a/src/Views/Base.vala
+++ b/src/Views/Base.vala
@@ -52,6 +52,7 @@ public class Tootle.Views.Base : Box {
         });
         content.remove.connect (() => on_content_changed ());
         content_list.remove.connect (() => on_content_changed ());
+        content_list.row_activated.connect (on_content_item_activated);
 
         notify["status-message"].connect (() => {
             status_message_label.label = @"<span size='large'>$status_message</span>";
@@ -112,4 +113,8 @@ public class Tootle.Views.Base : Box {
             ctx.add_class ("padded");
     }
 
+    public virtual void on_content_item_activated (ListBoxRow row) {
+	    Signal.emit_by_name (row, "open");
+	}
+
 }
diff --git a/src/Views/Search.vala b/src/Views/Search.vala
index fa51b84..f6612a7 100644
--- a/src/Views/Search.vala
+++ b/src/Views/Search.vala
@@ -30,14 +30,12 @@ public class Tootle.Views.Search : Views.Base {
     void append_account (API.Account acc) {
         var status = new API.Status.from_account (acc);
         var w = new Widgets.Status (status);
-        w.button_press_event.connect (w.on_avatar_clicked);
         content_list.insert (w, -1);
         on_content_changed ();
     }
 
     void append_status (API.Status status) {
         var w = new Widgets.Status (status);
-        w.button_press_event.connect (w.on_avatar_clicked);
         content_list.insert (w, -1);
         on_content_changed ();
     }
diff --git a/src/Widgets/Status.vala b/src/Widgets/Status.vala
index 6936698..5b33433 100644
--- a/src/Widgets/Status.vala
+++ b/src/Widgets/Status.vala
@@ -2,7 +2,7 @@ using Gtk;
 using Gdk;
 
 [GtkTemplate (ui = "/com/github/bleakgrey/tootle/ui/widgets/status.ui")]
-public class Tootle.Widgets.Status : EventBox {
+public class Tootle.Widgets.Status : ListBoxRow {
 
     public API.Status status { get; construct set; }
     public API.NotificationType? kind { get; construct set; }
@@ -82,6 +82,18 @@ public class Tootle.Widgets.Status : EventBox {
 		}
 	}
 
+    public virtual signal void open () {
+        if (status.id == "") {
+            var view = new Views.Profile (status.formal.account);
+            window.open_view (view);
+        }
+        else {
+            var formal = status.formal;
+            var view = new Views.ExpandedStatus (formal);
+            window.open_view (view);
+        }
+    }
+
     construct {
         content.activate_link.connect (on_toggle_spoiler);
         notify["kind"].connect (on_kind_changed);
@@ -126,10 +138,7 @@ public class Tootle.Widgets.Status : EventBox {
             content.single_line_mode = true;
             content.lines = 2;
             content.ellipsize = Pango.EllipsizeMode.END;
-            button_press_event.connect (on_avatar_clicked);
-        }
-        else {
-            button_press_event.connect (open);
+            button_release_event.connect (on_avatar_clicked);
         }
 
         if (!attachments.populate (status.formal.media_attachments) || status.id == "") {
@@ -137,7 +146,7 @@ public class Tootle.Widgets.Status : EventBox {
         }
 
         menu_button.clicked.connect (open_menu);
-        avatar.button_press_event.connect (on_avatar_clicked);
+        avatar.button_release_event.connect (on_avatar_clicked);
     }
 
     public Status (API.Status status, API.NotificationType? _kind = null) {
@@ -165,19 +174,10 @@ public class Tootle.Widgets.Status : EventBox {
     }
 
     public bool on_avatar_clicked (EventButton ev) {
-        if (ev.button == 1) {
+        if (ev.button == 1 && ev.type == EventType.BUTTON_RELEASE) {
             var view = new Views.Profile (status.formal.account);
             return window.open_view (view);
         }
-        return true;
-    }
-
-    public bool open (EventButton ev) {
-        if (ev.button == 1) {
-            var formal = status.formal;
-            var view = new Views.ExpandedStatus (formal);
-            return window.open_view (view);
-        }
         return false;
     }