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

appicon: Check whether we really got a BamfApplication associated with the icon, before we use it

Browse Source
This commit is contained in:
Tom Beckmann 2012-12-24 21:48:39 +01:00
parent cf1bed7e69
commit f1aedb9e88
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Widgets/AppIcon.vala
View File

@ -68,11 +68,12 @@ namespace Gala
var wallpaper = (WorkspaceThumb.destination as WorkspaceThumb).wallpaper; var wallpaper = (WorkspaceThumb.destination as WorkspaceThumb).wallpaper;
icons.add_child (actor); icons.add_child (actor);
var xids = app.get_xids (); // get all the windows that belong to this app, if possible
if (xids.length > 1) { //get all the windows that belong to this app if (app != null && app.get_xids ().length > 1) {
var wins = window.get_workspace ().list_windows (); var wins = window.get_workspace ().list_windows ();
for (var i=0;i<xids.length;i++) { var xids = app.get_xids ();
for (var i = 0; i < xids.length; i++) {
foreach (var win in wins) { foreach (var win in wins) {
if (xids.index (i) == (uint32)win.get_xwindow ()) if (xids.index (i) == (uint32)win.get_xwindow ())
win.change_workspace ((WorkspaceThumb.destination as WorkspaceThumb).workspace); win.change_workspace ((WorkspaceThumb.destination as WorkspaceThumb).workspace);
@ -88,6 +89,8 @@ namespace Gala
old.icons.animate (AnimationMode.LINEAR, 100, x:Math.floorf (old.wallpaper.x + old.wallpaper.width / 2 - old.icons.width / 2)); old.icons.animate (AnimationMode.LINEAR, 100, x:Math.floorf (old.wallpaper.x + old.wallpaper.width / 2 - old.icons.width / 2));
icons.animate (AnimationMode.LINEAR, 100, x:Math.floorf (wallpaper.x + wallpaper.width / 2 - icons.width / 2)); icons.animate (AnimationMode.LINEAR, 100, x:Math.floorf (wallpaper.x + wallpaper.width / 2 - icons.width / 2));
} }
WorkspaceThumb.destination = null;
} }
void drag_begin (Actor actor, float x, float y, ModifierType modifier) void drag_begin (Actor actor, float x, float y, ModifierType modifier)