elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-29 04:04:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle window added and removed while being in window overview

Browse Source
This commit is contained in:
Tom Beckmann 2012-09-01 17:17:02 +02:00
parent 2e21d99567
commit 102e5772ee
2 changed files with 64 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/Widgets/WindowOverview.vala
View File

@ -493,8 +493,9 @@ namespace Gala
ready = false;
var used_windows = new SList<Window> ();
var workspace = screen.get_active_workspace ();
foreach (var window in screen.get_active_workspace ().list_windows ()) {
foreach (var window in workspace.list_windows ()) {
if (window.window_type != WindowType.NORMAL && window.window_type != WindowType.DOCK) {
(window.get_compositor_private () as Actor).hide ();
continue;
@ -509,6 +510,9 @@ namespace Gala
if (n_windows == 0)
return;
workspace.window_added.connect (add_window);
workspace.window_removed.connect (remove_window);
Compositor.get_background_actor_for_screen (screen).
animate (AnimationMode.EASE_OUT_QUAD, 1000, dim_factor : 0.4);
@ -541,12 +545,56 @@ namespace Gala
calculate_places (get_children ());
}
void add_window (Window window)
{
if (!visible || window.get_workspace () != screen.get_active_workspace ())
return;
var actor = window.get_compositor_private () as WindowActor;
if (actor == null) {
Idle.add (() => {
if (window.get_compositor_private () != null &&
window.get_workspace () == screen.get_active_workspace ())
add_window (window);
return false;
});
return;
}
actor.hide ();
var clone = new WindowThumb (window);
clone.x = actor.x;
clone.y = actor.y;
clone.selected.connect (selected);
clone.reposition.connect (reposition);
add_child (clone);
calculate_places (get_children ());
}
void remove_window (Window window)
{
WindowThumb thumb = null;
foreach (var child in get_children ()) {
if ((child as WindowThumb).window == window)
thumb = child as WindowThumb;
}
if (thumb != null) {
thumb.close_window ();
reposition (thumb);
}
}
//called when a window has been closed
void reposition (WindowThumb removed)
{
var children = get_children ().copy ();
children.remove (removed);
calculate_places (children);
var children = get_children ().copy ();
children.remove (removed);
calculate_places (children);
}
void selected (Window window)
@ -561,6 +609,10 @@ namespace Gala
if (!visible || !ready)
return;
var workspace = screen.get_active_workspace ();
workspace.window_added.disconnect (add_window);
workspace.window_removed.disconnect (remove_window);
ready = false;
plugin.end_modal ();

10
src/Widgets/WindowThumb.vala
View File

@ -73,11 +73,19 @@ namespace Gala
if (event.button != 1)
return false;
close_window ();
return true;
}
public void close_window ()
{
//make sure we dont see a window closing animation in the background
(window.get_compositor_private () as Actor).opacity = 0;
get_parent ().set_child_below_sibling (this, null);
animate (AnimationMode.EASE_IN_CUBIC, 200, depth : -50.0f, opacity : 0).completed.connect (() => {
destroy ();
if (!window.
window.delete (window.get_screen ().get_display ().get_current_time ());
});
@ -85,8 +93,6 @@ namespace Gala
icon.destroy ();
reposition ();
return true;
}
public override bool enter_event (CrossingEvent event)