Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Toasts: Overlay close button on corner #480

Closed
wants to merge 11 commits into from
Closed

Toasts: Overlay close button on corner #480

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
22f428b
Fix #378
Mar 21, 2021
3b6ca17
Update Toast.vala
alainm23 Mar 29, 2021
40b84ef
Update Toast.vala
alainm23 Mar 29, 2021
35d162c
Merge branch 'master' into master
ryonakano Apr 7, 2021
9cec615
Update lib/Widgets/Toast.vala
alainm23 Apr 7, 2021
054e204
Update lib/Widgets/Toast.vala
alainm23 Apr 7, 2021
253fd92
Merge branch 'master' into master
cassidyjames Apr 20, 2021
efa19fd
Merge branch 'master' into master
Jun 22, 2021
396aa98
Merge branch 'master' into master
cassidyjames Jul 26, 2021
ba85363
Update xalign to label _description
alainm23 Sep 5, 2021
9da1936
Merge branch 'elementary:master' into master
alainm23 Sep 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions lib/Widgets/Toast.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,18 @@ namespace Granite.Widgets {
closed ();
});

notification_label = new Gtk.Label (title);
var close_revealer = new Gtk.Revealer ();
close_revealer.valign = Gtk.Align.START;
close_revealer.halign = Gtk.Align.START;
close_revealer.transition_type = Gtk.RevealerTransitionType.CROSSFADE;
alainm23 marked this conversation as resolved.
Show resolved Hide resolved
close_revealer.add (close_button);

notification_label = new Gtk.Label (title) {
margin_start = 3
};

var notification_box = new Gtk.Grid ();
notification_box.column_spacing = 12;
notification_box.add (close_button);
notification_box.add (notification_label);
notification_box.add (default_action_button);

Expand All @@ -111,11 +118,36 @@ namespace Granite.Widgets {
start_timeout ();
});

var notification_frame = new Gtk.Frame (null);
var notification_frame = new Gtk.Frame (null) {
margin = 6
};
notification_frame.get_style_context ().add_class ("app-notification");
notification_frame.add (event_box);

add (notification_frame);
var notification_overlay = new Gtk.Overlay ();
notification_overlay.add_overlay (close_revealer);
notification_overlay.add (notification_frame);

var notification_eventbox = new Gtk.EventBox ();
notification_eventbox.add_events (Gdk.EventMask.ENTER_NOTIFY_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK);
notification_eventbox.above_child = false;
notification_eventbox.add (notification_overlay);
alainm23 marked this conversation as resolved.
Show resolved Hide resolved

notification_eventbox.enter_notify_event.connect ((event) => {
close_revealer.reveal_child = true;
return true;
});

notification_eventbox.leave_notify_event.connect ((event) => {
if (event.detail == Gdk.NotifyType.INFERIOR) {
return false;
}

close_revealer.reveal_child = false;
return true;
});

add (notification_eventbox);
}

private void start_timeout () {
Expand Down