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

build: More compat fixes for mutter >= 3.4

Browse Source
This commit is contained in:
Rico Tzschichholz 2013-11-22 21:56:09 +01:00
parent 805f48530a
commit 1d2ddad0e2
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Plugin.vala
View File

@ -90,7 +90,9 @@ namespace Gala
var screen = get_screen ();
DBus.init (this);
#if HAS_MUTTER38
BackgroundCache.init (screen);
#endif
// Due to a bug which enables access to the stage when using multiple monitors
// in the screensaver, we have to listen for changes and make sure the input area

22
src/Widgets/WorkspaceThumb.vala
View File

@ -50,7 +50,7 @@ namespace Gala
#if HAS_MUTTER38
internal Actor wallpaper;
Actor wallpaper_wrapper;
Actor wallpaper_manager;
#else
internal Clone wallpaper;
#endif
@ -95,11 +95,11 @@ namespace Gala
handle_workspace_switched (-1, screen.get_active_workspace_index (), MotionDirection.LEFT);
#if HAS_MUTTER38
wallpaper = new BackgroundManager (screen);
wallpaper_manager = new BackgroundManager (screen);
//FIXME apparently there are issues with scaling and animating the opacity. The wallpaper will
// start flickering when the opacity changes. Wrapping it in a container solves this.
wallpaper_wrapper = new Clutter.Actor ();
wallpaper_wrapper.add_child (wallpaper);
wallpaper = new Clutter.Actor ();
wallpaper.add_child (wallpaper_manager);
#else
wallpaper = new Clone (Compositor.get_background_actor_for_screen (screen));
#endif
@ -129,7 +129,7 @@ namespace Gala
windows.clip_to_allocation = true;
add_child (indicator);
add_child (wallpaper_wrapper);
add_child (wallpaper);
add_child (windows);
add_child (icons);
add_child (close_button);
@ -211,8 +211,8 @@ namespace Gala
(indicator.content as Canvas).set_size ((int)indicator.width, (int)indicator.height);
#if HAS_MUTTER38
wallpaper.scale_x = width / swidth;
wallpaper.scale_y = THUMBNAIL_HEIGHT / sheight;
wallpaper_manager.scale_x = width / swidth;
wallpaper_manager.scale_y = THUMBNAIL_HEIGHT / sheight;
#endif
wallpaper.width = width;
windows.width = width;
@ -434,12 +434,12 @@ namespace Gala
}
if (index == screen.n_workspaces - 1) {
wallpaper_wrapper.opacity = 127;
wallpaper.opacity = 127;
if (plus.get_parent () != null)
plus.get_parent ().remove_child (plus);
add_child (plus);
} else {
wallpaper_wrapper.opacity = 255;
wallpaper.opacity = 255;
if (contains (plus))
remove_child (plus);
}
@ -552,7 +552,7 @@ namespace Gala
return false;
if (workspace.index () == screen.n_workspaces - 1) {
wallpaper_wrapper.animate (AnimationMode.EASE_OUT_QUAD, 300, opacity : 210);
wallpaper.animate (AnimationMode.EASE_OUT_QUAD, 300, opacity : 210);
return true;
}
@ -592,7 +592,7 @@ namespace Gala
return false;
if (workspace.index () == screen.n_workspaces - 1)
wallpaper_wrapper.animate (AnimationMode.EASE_OUT_QUAD, 400, opacity : 127);
wallpaper.animate (AnimationMode.EASE_OUT_QUAD, 400, opacity : 127);
else
hide_close_button ();

6
src/Widgets/WorkspaceView.vala
View File

@ -76,7 +76,7 @@ namespace Gala
hide ();
return true;
});
Compositor.get_stage_for_screen (screen).insert_child_below (click_catcher);
Compositor.get_stage_for_screen (screen).add_child (click_catcher);
#endif
add_child (thumbnails);
@ -118,7 +118,11 @@ namespace Gala
void init_thumbnails ()
{
foreach (var workspace in screen.get_workspaces ()) {
#if HAS_MUTTER38
var thumb = new WorkspaceThumb (workspace, plugin.background_group);
#else
var thumb = new WorkspaceThumb (workspace);
#endif
thumb.clicked.connect (hide);
thumb.closed.connect (remove_workspace);
thumb.window_on_last.connect (add_workspace);