toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

InAppNotification: Remove reduntant Overlay.

Browse Source
This commit is contained in:
Jordan Petridis 2018-03-09 19:46:46 +02:00
parent 8614922213
commit 064879c4ce
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
3 changed files with 68 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hammond-gtk/resources/gtk/inapp_notif.ui
View File

@ -2,15 +2,11 @@
<!-- 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">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkFrame">
<property name="visible">True</property>
@ -58,6 +54,9 @@
<property name="icon_name">window-close-symbolic</property>
</object>
</child>
<style>
<class name="flat image-button"/>
</style>
</object>
<packing>
<property name="expand">False</property>
@ -74,6 +73,9 @@
<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>
@ -92,10 +94,8 @@
</style>
</object>
</child>
</object>
<packing>
<property name="index">-1</property>
</packing>
</child>
<style>
<class name="top"/>
</style>
</object>
</interface>

2
hammond-gtk/src/app.rs
View File

@ -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();

5
hammond-gtk/src/appnotif.rs
View File

@ -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,