rrahl0/gala
1
0
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-11-25 03:06:14 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into leolost/color-manager

Browse Source
This commit is contained in:
Leonhard 2024-03-01 17:30:32 +01:00 committed by GitHub
commit 4a6d6383e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/WindowManager.vala
View File

@ -843,38 +843,27 @@ namespace Gala {
return (proxy in modal_stack);
}
private HashTable<Meta.Window, unowned Meta.WindowActor> dim_table =
new HashTable<Meta.Window, unowned Meta.WindowActor> (GLib.direct_hash, GLib.direct_equal);
private void dim_parent_window (Meta.Window window, bool dim) {
unowned var transient = window.get_transient_for ();
if (transient != null && transient != window) {
unowned var transient_actor = (Meta.WindowActor) transient.get_compositor_private ();
// Can't rely on win.has_effects since other effects could be applied
if (dim) {
if (window.window_type == Meta.WindowType.MODAL_DIALOG) {
var dark_effect = new Clutter.BrightnessContrastEffect ();
dark_effect.set_brightness (-0.4f);
transient_actor.add_effect_with_name ("dim-parent", dark_effect);
dim_table[window] = transient_actor;
}
} else if (transient_actor.get_effect ("dim-parent") != null) {
transient_actor.remove_effect_by_name ("dim-parent");
dim_table.remove (window);
}
private void dim_parent_window (Meta.Window window) {
if (window.window_type != MODAL_DIALOG) {
return;
}
if (!dim) {
// fall back to dim_data (see https://github.com/elementary/gala/issues/1331)
unowned var transient_actor = dim_table.take (window);
if (transient_actor != null) {
transient_actor.remove_effect_by_name ("dim-parent");
debug ("Removed dim using dim_data");
}
unowned var transient = window.get_transient_for ();
if (transient == null || transient == window) {
warning ("No transient found");
return;
}
unowned var transient_actor = (Meta.WindowActor) transient.get_compositor_private ();
var dark_effect = new Clutter.BrightnessContrastEffect ();
dark_effect.set_brightness (-0.4f);
transient_actor.add_effect_with_name ("dim-parent", dark_effect);
window.unmanaged.connect (() => {
if (transient_actor != null && transient_actor.get_effect ("dim-parent") != null) {
transient_actor.remove_effect_by_name ("dim-parent");
}
});
}
/**
@ -1548,7 +1537,7 @@ namespace Gala {
}
});
dim_parent_window (window, true);
dim_parent_window (window);
break;
case Meta.WindowType.NOTIFICATION:
@ -1627,8 +1616,6 @@ namespace Gala {
destroy_completed (actor);
});
dim_parent_window (window, false);
break;
case Meta.WindowType.MENU:
case Meta.WindowType.DROPDOWN_MENU: