Skip to content

Don't hide cinnamon's chrome if fullscreened app isn't top window #12958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't hide cinnamon's chrome if fullscreened app isn't top window #12958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 39 additions & 12 deletions js/ui/layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,6 +637,8 @@ Chrome.prototype = {
global.display.connect('restacked',
Lang.bind(this, this._windowsRestacked));
global.display.connect('in-fullscreen-changed', Lang.bind(this, this._updateVisibility));
global.display.connect('notify::focus-window', Lang.bind(this, this._updateVisibility));
global.display.connect('window-monitor-changed', Lang.bind(this, this._updateVisibility));
global.window_manager.connect('switch-workspace', Lang.bind(this, this._queueUpdateRegions));

// Need to update struts on new workspaces when they are added
Expand Down Expand Up @@ -773,18 +775,23 @@ Chrome.prototype = {
},

_updateVisibility: function() {
for (let i = 0; i < this._trackedActors.length; i++) {
let actorData = this._trackedActors[i], visible;
const monitorsInFullscreen = [];
this._monitors.forEach( monitor => {
const topWindow = this._getTopWindowOnMonitor(monitor.index)
monitorsInFullscreen[monitor.index] = topWindow && topWindow.is_fullscreen();
});

this._trackedActors.forEach( actorData => {
const monitor = this.findMonitorForActor(actorData.actor);
let visible = false;
if (!actorData.isToplevel)
continue;
return;
else if (global.stage_input_mode == Cinnamon.StageInputMode.FULLSCREEN) {
let monitor = this.findMonitorForActor(actorData.actor);

if (global.display.get_n_monitors() == 1 || !monitor.inFullscreen) {
visible = true;
} else {
if (Main.modalActorFocusStack.length > 0) {
let modalActor = Main.modalActorFocusStack[Main.modalActorFocusStack.length - 1].actor;
const modalActor = Main.modalActorFocusStack[Main.modalActorFocusStack.length - 1].actor;

if (this.findMonitorForActor(modalActor) == monitor) {
visible = true;
Expand All @@ -794,18 +801,38 @@ Chrome.prototype = {
} else if (this._inOverview)
visible = true;
else {
let monitor = this.findMonitorForActor(actorData.actor);

if (!actorData.visibleInFullscreen && monitor && monitor.inFullscreen)
visible = false;
else
if (actorData.visibleInFullscreen || !monitorsInFullscreen[monitor.index]) {
visible = true;
}
}
Main.uiGroup.set_skip_paint(actorData.actor, !visible);
}
});

this._queueUpdateRegions();
},

_getTopWindowOnMonitor: function(monitorIndex) {
const focusedWindow = global.display.get_focus_window();
if (focusedWindow && focusedWindow.get_monitor() === monitorIndex) {
return focusedWindow;
} else {
let topWindow = null, topWindowTime = 0;
global.get_window_actors().forEach(actor=> {
const window = actor.meta_window;
if (!window || window.get_monitor() !== monitorIndex ||
window.minimized || !window.showing_on_its_workspace() ||
window.get_workspace() !== global.workspace_manager.get_active_workspace())
return;
if (window.get_user_time() > topWindowTime) {
topWindowTime = window.get_user_time();
topWindow = window;
}
});

return topWindow;
}
},

_overviewShowing: function() {
this._inOverview = true;
this._updateVisibility();
Expand Down
2 changes: 1 addition & 1 deletion js/ui/panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,7 +1293,7 @@ PanelDummy.prototype = {

this.actor = new Cinnamon.GenericContainer({style_class: "panel-dummy", reactive: true, track_hover: true, important: true});

Main.layoutManager.addChrome(this.actor, { addToWindowgroup: false });
Main.layoutManager.addChrome(this.actor, { addToWindowgroup: false, visibleInFullscreen: true });
//
// layouts set to be full width horizontal panels, and vertical panels set to use as much available space as is left
//
Expand Down
Loading