edu4rdshl/gnome-shell
1
0
Fork 0
mirror of https://github.com/edu4rdshl/gnome-shell.git synced 2026-07-17 23:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

layout: Avoid recreating backgrounds if we only need to wait for them

Browse source 
In case backgrounds have just been created because of a monitors change
there's no need to update them again, but we can just wait for being
loaded.

As per this, if loading is startup animation is restarted because of
monitors changes, we can just wait until we've a background set again
This commit is contained in:
Marco Trevisan (Treviño) 2023-05-15 16:22:52 +02:00
parent 26da7c135a
commit cd2eee92ed
1 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

42
js/ui/layout.js
View file

@ -539,7 +539,7 @@ var LayoutManager = GObject.registerClass({
this._bgManagers = [];
if (Main.sessionMode.isGreeter)
return Promise.resolve();
return;
for (let i = 0; i < this.monitors.length; i++) {
let bgManager = this._createBackgroundManager(i);
@ -548,8 +548,14 @@ var LayoutManager = GObject.registerClass({
if (i != this.primaryIndex && this._startingUp)
bgManager.backgroundActor.hide();
}
}
return Promise.all(this._bgManagers.map(bgManager => this._waitLoaded(bgManager)));
_waitBackgroundsLoaded() {
if (this._bgManagers.every(bgManager => bgManager.isLoaded))
return Promise.resolve();
return Promise.all(this._bgManagers.map(bgManager =>
this._waitLoaded(bgManager)));
}
_updateKeyboardBox() {
@ -603,7 +609,7 @@ var LayoutManager = GObject.registerClass({
this._updateMonitors();
this._updateBoxes();
this._updateHotCorners();
this._updateBackgrounds().catch(logError);
this._updateBackgrounds();
this._updateFullscreen();
this._updateVisibility();
this._queueUpdateRegions();
@ -716,7 +722,6 @@ var LayoutManager = GObject.registerClass({
async _prepareStartupAnimation() {
// During the initial transition, add a simple actor to block all events,
// so they don't get delivered to X11 windows that have been transformed.
this._coverPane?.destroy();
this._coverPane = new Clutter.Actor({
opacity: 0,
width: global.screen_width,
@ -756,18 +761,6 @@ var LayoutManager = GObject.registerClass({
prepareMonitor(this.primaryMonitor);
try {
await this._updateBackgrounds();
} catch (e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
this._prepareStartupAnimation().catch(logError);
return;
}
logError(e);
return;
}
this._startupMonitorsChangedId = this.connect('monitors-changed', () => {
this._coverPane.set({
width: global.screen_width,
@ -775,6 +768,23 @@ var LayoutManager = GObject.registerClass({
});
prepareMonitor(this.primaryMonitor);
});
this._updateBackgrounds();
while (true) {
try {
// eslint-disable-next-line no-await-in-loop
await this._waitBackgroundsLoaded();
break;
} catch (e) {
if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED)) {
logError(e);
this.disconnect(this._startupMonitorsChangedId);
this._startupMonitorsChangedId = 0;
return;
}
}
}
}
// Hack: Work around grab issue when testing greeter UI in nested