RomanNum3ral
/
breezy-desktop
mirror of https://github.com/wheaney/breezy-desktop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix GNOME 46 compatibility issue

This commit is contained in:
wheaney 2024-04-22 14:48:31 -07:00
parent 9429b29ac8
commit 73ac5a67b6
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnome/breezydesktop@org.xronlinux/cursormanager.js
View File

@ -73,7 +73,11 @@ export class CursorManager {
this._cursorSprite.content = new MouseSpriteContent(); this._cursorSprite.content = new MouseSpriteContent();
this._cursorActor = new Clutter.Actor(); this._cursorActor = new Clutter.Actor();
this._cursorActor.add_actor(this._cursorSprite); if (Clutter.Container === undefined) {
this._cursorActor.add_child(this._cursorSprite);
} else {
this._cursorActor.add_actor(this._cursorSprite);
}
this._cursorWatcher = PointerWatcher.getPointerWatcher(); this._cursorWatcher = PointerWatcher.getPointerWatcher();
this._cursorSeat = Clutter.get_default_backend().get_default_seat(); this._cursorSeat = Clutter.get_default_backend().get_default_seat();
} }
@ -119,7 +123,11 @@ export class CursorManager {
// prereqs: setup in _enableCloningMouse, _cursorWantedVisible is true // prereqs: setup in _enableCloningMouse, _cursorWantedVisible is true
_startCloningMouse() { _startCloningMouse() {
if (this._cursorWatch == null) { if (this._cursorWatch == null) {
this._mainActor.add_actor(this._cursorActor); if (Clutter.Container === undefined) {
this._mainActor.add_child(this._cursorActor);
} else {
this._mainActor.add_actor(this._cursorActor);
}
this._cursorChangedConnection = this._cursorTracker.connect('cursor-changed', this._updateMouseSprite.bind(this)); this._cursorChangedConnection = this._cursorTracker.connect('cursor-changed', this._updateMouseSprite.bind(this));
this._cursorVisibilityChangedConnection = this._cursorTracker.connect('visibility-changed', this._updateMouseSprite.bind(this)); this._cursorVisibilityChangedConnection = this._cursorTracker.connect('visibility-changed', this._updateMouseSprite.bind(this));
this._cursorPositionInvalidatedConnection = this._cursorTracker.connect('position-invalidated', this._updateMouseSprite.bind(this)); this._cursorPositionInvalidatedConnection = this._cursorTracker.connect('position-invalidated', this._updateMouseSprite.bind(this));
@ -161,7 +169,11 @@ export class CursorManager {
this._cursorTracker.disconnect(this._cursorPositionInvalidatedConnection); this._cursorTracker.disconnect(this._cursorPositionInvalidatedConnection);
this._cursorPositionInvalidatedConnection = null; this._cursorPositionInvalidatedConnection = null;
this._mainActor.remove_actor(this._cursorActor); if (Clutter.Container === undefined) {
this._mainActor.remove_child(this._cursorActor);
} else {
this._mainActor.remove_actor(this._cursorActor);
}
} }
if (this._cursorTracker.set_keep_focus_while_hidden) { if (this._cursorTracker.set_keep_focus_while_hidden) {

6
gnome/breezydesktop@org.xronlinux/extension.js
View File

@ -116,7 +116,11 @@ export default class BreezyDesktopExtension extends Extension {
const uiClone = new Clutter.Clone({ source: Main.layoutManager.uiGroup, clip_to_allocation: true }); const uiClone = new Clutter.Clone({ source: Main.layoutManager.uiGroup, clip_to_allocation: true });
uiClone.x = -this._target_monitor.x; uiClone.x = -this._target_monitor.x;
uiClone.y = -this._target_monitor.y; uiClone.y = -this._target_monitor.y;
overlayContent.add_actor(uiClone); if (Clutter.Container === undefined) {
overlayContent.add_child(uiClone);
} else {
overlayContent.add_actor(uiClone);
}
this._overlay.set_child(overlayContent); this._overlay.set_child(overlayContent);