From 064879c4ce9268e29d299aa1e0c60ebdfa7e62e3 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jordanpetridis@protonmail.com>
Date: Fri, 9 Mar 2018 19:46:46 +0200
Subject: [PATCH] InAppNotification: Remove reduntant Overlay.

---
 hammond-gtk/resources/gtk/inapp_notif.ui | 132 +++++++++++------------
 hammond-gtk/src/app.rs                   |   2 +-
 hammond-gtk/src/appnotif.rs              |   5 +-
 3 files changed, 68 insertions(+), 71 deletions(-)

diff --git a/hammond-gtk/resources/gtk/inapp_notif.ui b/hammond-gtk/resources/gtk/inapp_notif.ui
index 2b14bd1..14761b6 100644
--- a/hammond-gtk/resources/gtk/inapp_notif.ui
+++ b/hammond-gtk/resources/gtk/inapp_notif.ui
@@ -2,100 +2,100 @@
 <!-- Generated with glade 3.21.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkOverlay" id="overlay">
+  <object class="GtkRevealer" id="revealer">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="halign">center</property>
     <property name="valign">start</property>
     <child>
-      <object class="GtkRevealer" id="revealer">
+      <object class="GtkFrame">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="halign">center</property>
+        <property name="valign">center</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
         <child>
-          <object class="GtkFrame">
+          <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="margin_left">6</property>
+            <property name="margin_right">6</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkBox">
+              <object class="GtkLabel" id="text">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="margin_left">6</property>
-                <property name="margin_right">6</property>
-                <property name="spacing">6</property>
+                <property name="label" translatable="yes">An in-app action notification</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="close">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="focus_on_click">False</property>
+                <property name="receives_default">True</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <property name="relief">none</property>
                 <child>
-                  <object class="GtkLabel" id="text">
+                  <object class="GtkImage">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="label" translatable="yes">An in-app action notification</property>
+                    <property name="icon_name">window-close-symbolic</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="close">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="focus_on_click">False</property>
-                    <property name="receives_default">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                    <property name="relief">none</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="icon_name">window-close-symbolic</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="undo">
-                    <property name="label" translatable="yes">Undo</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">center</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
-                    <property name="position">2</property>
-                  </packing>
                 </child>
+                <style>
+                  <class name="flat image-button"/>
+                </style>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">1</property>
+              </packing>
             </child>
-            <child type="label_item">
-              <placeholder/>
+            <child>
+              <object class="GtkButton" id="undo">
+                <property name="label" translatable="yes">Undo</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="halign">center</property>
+                <property name="valign">center</property>
+                <style>
+                  <class name="text-button"/>
+                </style>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
+              </packing>
             </child>
-            <style>
-              <class name="app-notification"/>
-            </style>
           </object>
         </child>
+        <child type="label_item">
+          <placeholder/>
+        </child>
+        <style>
+          <class name="app-notification"/>
+        </style>
       </object>
-      <packing>
-        <property name="index">-1</property>
-      </packing>
     </child>
+    <style>
+      <class name="top"/>
+    </style>
   </object>
 </interface>
diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs
index a9a125b..4fbdfd0 100644
--- a/hammond-gtk/src/app.rs
+++ b/hammond-gtk/src/app.rs
@@ -171,7 +171,7 @@ impl App {
 
                     let text = "Marked all episodes as listened";
                     let notif = InAppNotification::new(text.into(), callback, sender.clone());
-                    overlay.add_overlay(&notif.overlay);
+                    overlay.add_overlay(&notif.revealer);
                     // We need to display the notification after the widget is added to the overlay
                     // so there will be a nice animation.
                     notif.show();
diff --git a/hammond-gtk/src/appnotif.rs b/hammond-gtk/src/appnotif.rs
index a949fae..1ba012e 100644
--- a/hammond-gtk/src/appnotif.rs
+++ b/hammond-gtk/src/appnotif.rs
@@ -10,8 +10,7 @@ use std::sync::mpsc::Sender;
 
 #[derive(Debug, Clone)]
 pub struct InAppNotification {
-    pub overlay: gtk::Overlay,
-    revealer: gtk::Revealer,
+    pub revealer: gtk::Revealer,
     text: gtk::Label,
     undo: gtk::Button,
     close: gtk::Button,
@@ -21,14 +20,12 @@ impl Default for InAppNotification {
     fn default() -> Self {
         let builder = gtk::Builder::new_from_resource("/org/gnome/hammond/gtk/inapp_notif.ui");
 
-        let overlay: gtk::Overlay = builder.get_object("overlay").unwrap();
         let revealer: gtk::Revealer = builder.get_object("revealer").unwrap();
         let text: gtk::Label = builder.get_object("text").unwrap();
         let undo: gtk::Button = builder.get_object("undo").unwrap();
         let close: gtk::Button = builder.get_object("close").unwrap();
 
         InAppNotification {
-            overlay,
             revealer,
             text,
             undo,