From 4e7c6ad225f9908feb634d8486fa252513d0e5f3 Mon Sep 17 00:00:00 2001
From: Bleak Grey <bleakgrey@gmail.com>
Date: Sat, 24 Oct 2020 06:42:24 +0300
Subject: [PATCH] Close #204

---
 data/app.css                            |  9 +++++----
 data/ui/widgets/accounts_button_item.ui |  2 +-
 data/ui/widgets/attachment_slot.ui      | 21 ++++++++++++++-------
 data/ui/widgets/status.ui               |  2 +-
 src/Widgets/Attachment/Slot.vala        | 22 +++++++---------------
 src/Widgets/Conversation.vala           |  4 ++--
 6 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/data/app.css b/data/app.css
index ff74c41..a8712ff 100644
--- a/data/app.css
+++ b/data/app.css
@@ -5,13 +5,13 @@
 }
 
 .attachment {
-	border-radius: 6px;
+	border-radius: 5px;
 	background: rgba (150, 150, 150, 0.2);
 	padding:0px;
 	margin:0px;
 }
 .attachment .pic {
-	border-radius: 6px;
+	border-radius: 5px;
 }
 .attachment .chip {
 	padding: 6px;
@@ -36,6 +36,7 @@
 	box-shadow: none;
 }
 
-.ttl-avatar-button {
-  padding: 0;
+.ttl-flat-button {
+  padding: 0px;
+  margin: 0px;
 }
diff --git a/data/ui/widgets/accounts_button_item.ui b/data/ui/widgets/accounts_button_item.ui
index 61635d1..7ea97f3 100644
--- a/data/ui/widgets/accounts_button_item.ui
+++ b/data/ui/widgets/accounts_button_item.ui
@@ -43,7 +43,7 @@
                       <class name="flat"/>
                       <class name="image-button"/>
                       <class name="circular"/>
-                      <class name="ttl-avatar-button"/>
+                      <class name="ttl-flat-button"/>
                     </style>
                   </object>
                   <packing>
diff --git a/data/ui/widgets/attachment_slot.ui b/data/ui/widgets/attachment_slot.ui
index 09682bb..a3ca21b 100644
--- a/data/ui/widgets/attachment_slot.ui
+++ b/data/ui/widgets/attachment_slot.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.22"/>
   <template class="TootleWidgetsAttachmentSlot" parent="GtkFlowBoxChild">
@@ -8,9 +8,11 @@
     <property name="can_focus">True</property>
     <property name="hexpand">True</property>
     <child>
-      <object class="GtkEventBox" id="event_box">
+      <object class="GtkButton" id="button">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <signal name="clicked" handler="on_clicked" swapped="no"/>
         <child>
           <object class="GtkGrid" id="overlay">
             <property name="visible">True</property>
@@ -22,6 +24,8 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
+                <property name="margin_left">16</property>
+                <property name="margin_right">16</property>
                 <property name="margin_start">16</property>
                 <property name="margin_end">16</property>
                 <property name="margin_top">16</property>
@@ -46,6 +50,8 @@
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="valign">start</property>
+                <property name="margin_left">6</property>
+                <property name="margin_right">6</property>
                 <property name="margin_start">6</property>
                 <property name="margin_end">6</property>
                 <property name="margin_top">6</property>
@@ -74,7 +80,7 @@
                     <property name="height_request">32</property>
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="opacity">0.5019607843137255</property>
+                    <property name="opacity">0.50196078431372548</property>
                     <property name="halign">center</property>
                     <property name="valign">center</property>
                     <property name="hexpand">True</property>
@@ -91,11 +97,12 @@
                 <property name="top_attach">0</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
         </child>
+        <style>
+          <class name="flat"/>
+          <class name="ttl-flat-button"/>
+        </style>
       </object>
     </child>
     <style>
diff --git a/data/ui/widgets/status.ui b/data/ui/widgets/status.ui
index 70adc09..f82bf85 100644
--- a/data/ui/widgets/status.ui
+++ b/data/ui/widgets/status.ui
@@ -408,7 +408,7 @@
               <class name="flat"/>
               <class name="image-button"/>
               <class name="circular"/>
-              <class name="ttl-avatar-button"/>
+              <class name="ttl-flat-button"/>
             </style>
           </object>
           <packing>
diff --git a/src/Widgets/Attachment/Slot.vala b/src/Widgets/Attachment/Slot.vala
index 6f9cc69..857ab6b 100644
--- a/src/Widgets/Attachment/Slot.vala
+++ b/src/Widgets/Attachment/Slot.vala
@@ -4,14 +4,10 @@ using Gdk;
 [GtkTemplate (ui = "/com/github/bleakgrey/tootle/ui/widgets/attachment_slot.ui")]
 public class Tootle.Widgets.Attachment.Slot : FlowBoxChild {
 
-	[GtkChild]
-	EventBox event_box;
-	[GtkChild]
-	Label chip;
-	[GtkChild]
-	Image play_icon;
-	[GtkChild]
-	Stack stack;
+	[GtkChild] Button button;
+	[GtkChild] Label chip;
+	[GtkChild] Image play_icon;
+	[GtkChild] Stack stack;
 
 	public API.Attachment attachment { get; construct set; }
 
@@ -42,8 +38,7 @@ public class Tootle.Widgets.Attachment.Slot : FlowBoxChild {
 	}
 
 	construct {
-		event_box.tooltip_text = attachment.description;
-		event_box.button_release_event.connect (on_clicked);
+		button.tooltip_text = attachment.description;
 	}
 
 	void download () {
@@ -60,12 +55,9 @@ public class Tootle.Widgets.Attachment.Slot : FlowBoxChild {
         () => {});
 	}
 
-    protected virtual bool on_clicked (EventButton ev) {
-		if (ev.button != 1)
-			return false;
-
+	[GtkCallback]
+    protected virtual void on_clicked () {
 		open ();
-		return true;
     }
 
 }
diff --git a/src/Widgets/Conversation.vala b/src/Widgets/Conversation.vala
index 76ffb45..a8800c3 100644
--- a/src/Widgets/Conversation.vala
+++ b/src/Widgets/Conversation.vala
@@ -23,7 +23,7 @@ public class Tootle.Widgets.Conversation : Widgets.Status {
 				if (conversation.accounts.last () != account)
 					label += ", ";
 			}
-			return @"$label";
+			return label;
 		}
 	}
 
@@ -33,7 +33,7 @@ public class Tootle.Widgets.Conversation : Widgets.Status {
 			foreach (API.Account account in conversation.accounts) {
 				label += account.handle + " ";
 			}
-			return @"<small>$label</small>";
+			return label;
 		}
 	}