zoriya/ags
1
0
Fork 0
mirror of https://github.com/zoriya/ags.git synced 2026-06-08 04:31:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix overlay child and overlays attributes

Browse Source
This commit is contained in:
Aylur
2023-08-25 15:03:30 +02:00
parent e72260653c
commit c59a9202a0
1 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/overlay.ts
+15 -24
View File
@@ -6,17 +6,6 @@ export default class AgsOverlay extends Gtk.Overlay {
GObject.registerClass({
GTypeName: 'AgsOverlay',
Properties: {
'child': GObject.ParamSpec.object(
'child', 'Child', 'Child',
GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT,
Gtk.Widget.$gtype,
),
// @ts-ignore
'overlays': GObject.ParamSpec.jsobject(
'overlays', 'Overlays', 'Overlays',
GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT,
[],
),
'pass-through': GObject.ParamSpec.boolean(
'pass-through', 'Pass Through', 'Pass Through',
GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT,
@@ -26,6 +15,11 @@ export default class AgsOverlay extends Gtk.Overlay {
}, this);
}
constructor({ overlays = [], ...rest } = {}) {
super(rest);
this.overlays = overlays;
}
_passthrough = false;
get pass_through() { return this._passthrough; }
set pass_through(passthrough: boolean) {
@@ -34,8 +28,8 @@ export default class AgsOverlay extends Gtk.Overlay {
this.set_overlay_pass_through(ch, passthrough));
}
_child!: Gtk.Widget;
get child() { return this._child; }
// @ts-ignore
get child() { return this.get_child(); }
set child(child: Gtk.Widget) {
const widget = this.get_child();
if (widget === child)
@@ -44,7 +38,6 @@ export default class AgsOverlay extends Gtk.Overlay {
if (widget)
widget.destroy();
this._child = child;
if (child)
this.add(child);
}
@@ -52,26 +45,24 @@ export default class AgsOverlay extends Gtk.Overlay {
_overlays!: Gtk.Widget[];
get overlays() { return this._overlays; }
set overlays(overlays: Gtk.Widget[]) {
overlays ||= [];
this.get_children().filter(
ch => ch !== this._child
&& !overlays.includes(ch),
)
this.get_children()
.filter(ch => ch !== this.child && !overlays.includes(ch))
.forEach(ch => ch.destroy());
this.get_children()
.forEach(ch => this.remove_overlay(ch));
.filter(ch => ch !== this.child)
.forEach(ch => this.remove(ch));
this._overlays = [];
overlays.forEach(ch => this.add_overlay(ch));
// reset passthrough
this.get_children().forEach(ch =>
this.set_overlay_pass_through(ch, this.pass_through));
}
add_overlay(widget: Gtk.Widget): void {
this._overlays.push(widget);
super.add_overlay(widget);
}
remove_overlay(widget: Gtk.Widget): void {
super.remove(widget);
}
}