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

Plus icon scaled up to 48px, scroll back workspace view on close, made plus button easier to see

Browse Source
This commit is contained in:
Tom Beckmann 2012-06-15 21:21:53 +02:00
parent a6d9a1ecc0
commit 60a6d14440
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Main.vala
View File

@ -342,8 +342,8 @@ namespace Gala
if (rect.x < 100 && rect.y < 100) { //guess the window is placed at a bad spot if (rect.x < 100 && rect.y < 100) { //guess the window is placed at a bad spot
window.move_frame (true, (int)(width/2.0f - rect.width/2.0f), window.move_frame (true, (int)(width/2.0f - rect.width/2.0f),
(int)(height/2.0f - rect.height/2.0f)); (int)(height/2.0f - rect.height/2.0f));
actor.x = width/2.0f - rect.width/2.0f - 10; actor.x = width/2.0f - rect.width/2.0f;
actor.y = height/2.0f - rect.height/2.0f - 10; actor.y = height/2.0f - rect.height/2.0f;
} }
} }

41
src/Widgets/WorkspaceView.vala
View File

@ -348,6 +348,10 @@ namespace Gala
&& workspaces.width + workspaces.x > width) { //left && workspaces.width + workspaces.x > width) { //left
workspaces.x -= scroll_speed; workspaces.x -= scroll_speed;
current_workspace.x -= scroll_speed; current_workspace.x -= scroll_speed;
if (!(workspaces.width + workspaces.x > width)) {
current_workspace.x = workspaces.width - width;
print ("got it..\n");
}
} else if ((event.direction == Clutter.ScrollDirection.UP || event.direction == Clutter.ScrollDirection.LEFT) } else if ((event.direction == Clutter.ScrollDirection.UP || event.direction == Clutter.ScrollDirection.LEFT)
&& workspaces.x < 0) { //right && workspaces.x < 0) { //right
workspaces.x += scroll_speed; workspaces.x += scroll_speed;
@ -452,13 +456,31 @@ namespace Gala
gw.destroy (); gw.destroy ();
} }
}); });
current_workspace.animate (Clutter.AnimationMode.EASE_IN_SINE, 100, opacity:0);
Timeout.add (250, () => { //give the windows time to close Timeout.add (250, () => { //give the windows time to close
screen.remove_workspace (space, screen.get_display ().get_current_time ()); screen.remove_workspace (space, screen.get_display ().get_current_time ());
scroll.visible = workspaces.width > width;
if (scroll.visible) {
if (workspaces.x + workspaces.width < width)
workspaces.x = width - workspaces.width;
scroll.width = width/workspaces.width*width;
} else {
workspaces.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, x:width / 2 - workspaces.width / 2).
completed.connect (() => {
Timeout.add (250, () => {
workspace = screen.get_active_workspace ().index (); workspace = screen.get_active_workspace ().index ();
current_workspace.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 250, opacity:255);
return false;
});
});
}
return false; return false;
}); });
group.animate (Clutter.AnimationMode.EASE_IN_QUAD, 250, width:0.0f, opacity:0).completed.connect (() => { group.animate (Clutter.AnimationMode.LINEAR, 150, width:0.0f, opacity:0).completed.connect (() => {
workspaces.remove_child (group); workspaces.remove_child (group);
}); });
@ -466,12 +488,19 @@ namespace Gala
}); });
if (space.index () == screen.n_workspaces - 1) { //give the last one a different style if (space.index () == screen.n_workspaces - 1) { //give the last one a different style
group.opacity = 127; backg.opacity = 127;
var css = new Gtk.CssProvider ();
var img = new Gtk.Image ();
try {
css.load_from_data ("*{text-shadow:0 1 #f00;color:alpha(#fff, 0.8);}", -1);
} catch (Error e) { warning(e.message); }
img.get_style_context ().add_provider (css, 20000);
var plus = new GtkClutter.Texture (); var plus = new GtkClutter.Texture ();
try { try {
var pix = Gtk.IconTheme.get_default ().choose_icon ({"list-add-symbolic", "list-add"}, 32, 0). var pix = Gtk.IconTheme.get_default ().choose_icon ({"list-add-symbolic", "list-add"}, 48, 0).
load_symbolic ({1, 1, 1, 1}); load_symbolic_for_context (img.get_style_context ());
plus.set_from_pixbuf (pix); plus.set_from_pixbuf (pix);
} catch (Error e) { warning (e.message); } } catch (Error e) { warning (e.message); }
@ -498,7 +527,7 @@ namespace Gala
}); });
if (space.index () == screen.n_workspaces - 1) if (space.index () == screen.n_workspaces - 1)
group.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 300, opacity:210); backg.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 300, opacity:210);
hovering = true; hovering = true;
@ -514,7 +543,7 @@ namespace Gala
hovering = false; hovering = false;
if (space.index () == screen.n_workspaces - 1) if (space.index () == screen.n_workspaces - 1)
group.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, opacity:127); backg.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, opacity:127);
return false; return false;
}); });