Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
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
2 changes: 1 addition & 1 deletion js/ui/applet.js
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@
this._applet_context_menu.addMenuItem(this.context_menu_item_about);
}

if (!this._meta["hide-configuration"] && GLib.file_test(this._meta["path"] + "/settings-schema.json", GLib.FileTest.EXISTS)) {

Check failure on line 606 in js/ui/applet.js

View workflow job for this annotation

GitHub Actions / build / build (mint22, linuxmintd/mint22.3-amd64, Mint 22, true) / Mint 22

FileTest ==> file test
if (this.context_menu_item_configure == null) {
this.context_menu_item_configure = new PopupMenu.PopupIconMenuItem(_("Configure..."),
"xsi-preferences",
Expand Down Expand Up @@ -656,7 +656,7 @@
}

get _panelHeight() {
return this.panel.height;
return this.panel.heightForZones;
}

get _scaleMode() {
Expand Down
2 changes: 1 addition & 1 deletion js/ui/appletManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ function createApplet(extension, appletDefinition, panel = null) {
// FIXME: Panel height is now available before an applet is initialized,
// so we don't need to pass it to the constructor anymore, but would
// require a compatibility clean-up effort.
applet = extension.module.main(extension.meta, orientation, panel.height, applet_id);
applet = extension.module.main(extension.meta, orientation, panel.heightForZone, applet_id);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be Zones not Zone?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Fixed now.

} catch (e) {
Extension.logError(`Failed to evaluate 'main' function on applet: ${uuid}/${applet_id}`, uuid, e);
return null;
Expand Down
Loading
Loading