slint-ui 1.0.1 → 1.1.0

package/LICENSE.md

@@ -1,6 +1,11 @@
 # Slint License
 
-Slint is available under either a [proprietary license](LICENSES/LicenseRef-Slint-commercial.md)
-or [GNU GPLv3](LICENSES/GPL-3.0-only.txt).
+You can use Slint under ***any*** of the following licenses, at your choice:
+
+1. [Royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free-1.0.md),
+2. [GNU GPLv3](LICENSES/GPL-3.0-only.txt),
+3. [Paid license](https://slint.dev/pricing.html).
 
 Third party licenses listed in the `LICENSES` folder also apply to parts of the product.
+
+Contact us at [info@slint.dev](mailto:info@slint.dev) if you have any questions regarding licensing.

package/LICENSES/LicenseRef-Slint-Royalty-free-1.0.md

@@ -0,0 +1,37 @@
+# Slint Royalty-free Desktop and Web Applications License, version 1.0
+
+## Preamble
+
+Slint is a toolkit that can be used to build user interfaces for applications. Slint (hereafter referred to as "Software") is made available under different licenses by SixtyFPS GmbH incorporated at Oranienburger Str. 44, 16540 Hohen Neuendorf, Germany ("SixtyFPS"). The "Slint Royalty-free Desktop and Web Applications License" is suitable for those who develop desktop or web applications and do not want to use open source components under copyleft licenses.
+
+### 1. Grant of Rights
+
+SixtyFPS hereby grants You a world-wide, royalty-free, non-exclusive license to use, reproduce, make available, modify, display, perform, distribute the Software as part of a Desktop or Web Application.
+
+A Desktop Application is a computer program that is designed to run on a general-purpose computer (PC or notebook), typically installed and executed locally on the computer's operating system. A Web Application is a computer program that is running on a server and accessed using a web browser or client program.
+
+Desktop Application and Web Application are hereafter referred to as "Application".
+
+### 2. Limitations
+
+The license does not permit to distribute or make the Software publicly available alone and without integration into an Application. For this purpose you may use the Software under the GNU General Public License, version 3.
+
+The license does not permit the use of the Software within Embedded Systems. An Embedded System is a computer system designed to perform a specific task within a larger mechanical or electrical system. For the purposes of this license, mobile phones are not considered to be Embedded Systems.
+
+### 3. License Conditions - Attribution
+
+You may distribute the Software as part of an Application, modified or unmodified, provided that You do all of the following:
+
+(a) Display the [`AboutSlint`](https://slint.dev/snapshots/master/docs/slint/src/builtins/widgets.html#aboutslint) widget in an "About" screen or dialog that is accessible from the top level menu of the Application.
+
+(b) Display the [Slint attribution badge](https://github.com/slint-ui/slint/tree/master/logo/madewithslint) on a public webpage, preferably where the binaries of your Application can be downloaded from, in such a way that it can be easily found by any visitor to that page.
+
+(c) You may not remove or alter any license notices (including copyright notices, disclaimers of warranty, or limitations of liability) contained within the source code form of the Software.
+
+(d) You allow SixtyFPS to show your Application on <https://madewithslint.com> and in advertising materials of SixtyFPS as a reference and to display your logo and trademark for this purpose.
+
+### 4. Warranty and Liability
+
+SixtyFPS is only liable for conflicting rights of third parties if SixtyFPS was aware of these rights without informing you. Unless required by applicable law or agreed to in writing, SixtyFPS provides the SOFTWARE on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+
+UNLESS REQUIRED BY LAW, SIXTYFPS WON'T BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE.

package/LICENSES/LicenseRef-Slint-commercial.md

@@ -1,8 +1,8 @@
 # Slint Software License Agreement
 
-Version 1.2
+Version 2.0
 
-Copyright © 2022 SixtyFPS GmbH <https://slint-ui.com/imprint.html>
+Copyright © 2023 SixtyFPS GmbH <https://slint.dev/imprint.html>
 
 SixtyFPS GmbH with offices at Oranienburger Str. 44, 16540 Hohen Neuendorf,
 Germany (**SixtyFPS**, **us**, **we** or **our**) grants a license to the
@@ -102,55 +102,38 @@ The Licensed Software includes
     date, the license shall not be granted and your Products shall be deemed as
     made in breach of the Agreement ex tunc.
 
-11. Clause 10 above shall not apply if the license has been granted to you under
-    the **Ambassador** program. Instead, the license grants shall be conditional
-    on the fulfillment of the obligations as specified herein. If said
-    obligations are not fulfilled, the license shall not be granted and your
-    Products shall be deemed as made in breach of the Agreement ex tunc. The
-    obligations are as follows:
-
-    1. Showcase: You grant us the right to use your name, logo, and your
-        Products in our marketing materials,
-
-    2. Spread the word: You will include visible notices in the documentation,
-        marketing materials, and social media channels related to your Products
-        that such were built with the Licensed Software,
-
-    3. Give feedback: You agree to provide feedback that would help us improve
-        the Licensed Software. We may use any such feedback in testimonials.
-
-12. The Fees and any other charges under this Agreement shall be paid by
+11. The Fees and any other charges under this Agreement shall be paid by
     you no later than thirty (30) days from the date of the applicable
     invoice from us. A late payment charge of five percent per month over and
     above the interest rate stipulated by applicable law shall be charged on any
     unpaid balances that remain past due and which have not been disputed by you
     in good faith.
 
-13. The Fees and any other charges payable under this Agreement are gross
+12. The Fees and any other charges payable under this Agreement are gross
     amounts but exclusive of any value added tax, use tax, sales tax,
     withholding tax and other taxes, duties or tariffs levied directly for the
     sale, delivery, or use of the Licensed Software pursuant to any applicable
     law.
 
-14. The Parties also agree to all the following conditions:
+13. The Parties also agree to all the following conditions:
 
-    1. You may not remove or alter any copyright, trademark, or other
+    (a) You may not remove or alter any copyright, trademark, or other
         proprietary rights notice contained in any portion of the Licensed
         Software,
 
-    2. Your Products may not compete with the Licensed Software,
+    (b) Your Products may not compete with the Licensed Software,
 
-    3. You will indemnify and hold us, our affiliated companies, and our
+    (c) You will indemnify and hold us, our affiliated companies, and our
         suppliers, harmless from and against any claims or liabilities
         arising out of the use, reproduction, or distribution of your
-        Products, except as set out in clause 14.4. immediately below,
+        Products, except as set out in clause 13.(d) immediately below,
 
-    4. We shall indemnify and hold you harmless from and against any
+    (d) We shall indemnify and hold you harmless from and against any
         claims from third parties alleging that the use of the Licensed Software
         as set out in this Agreement infringes or will infringe such third
         parties' intellectual property rights or other rights,
 
-    5. A Party shall promptly notify the other Party if it receives a claim that
+    (e) A Party shall promptly notify the other Party if it receives a claim that
         the other Party shall or may be obliged to indemnify. The Parties shall
         promptly give each other information and other assistance needed for
         handling the claim. The Indemnifying Party may, at its cost and in its
@@ -168,7 +151,7 @@ The Licensed Software includes
         the indemnifying Party, such consent not to be unreasonably withheld or
         delayed.
 
-15. The Licensed Software is licensed to you "as is". To the maximum extent
+14. The Licensed Software is licensed to you "as is". To the maximum extent
     permitted by applicable law, we on behalf of us and our suppliers,
     disclaim all warranties and conditions, either express or implied,
     including, but not limited to, any implied warranties of merchantability or
@@ -178,7 +161,7 @@ The Licensed Software includes
     state/jurisdiction to state/jurisdiction; as far as legally permissible, you
     waive any such legal rights vis-à-vis us.
 
-16. We shall not under any circumstances be liable to you based on failure of
+15. We shall not under any circumstances be liable to you based on failure of
     the Licensed Software if the failure resulted from your changing of the
     Licensed Software, from your accident, abuse or misapplication, nor shall
     we except in case of gross negligence or willful misconduct be
@@ -187,7 +170,7 @@ The Licensed Software includes
     nor shall any award of damages exceed the total amount you paid to us in
     connection with this Agreement.
 
-17. Each Party shall hold Confidential Information of the other Party, its
+16. Each Party shall hold Confidential Information of the other Party, its
     customers, and licensors in confidence, and without written permission from
     will not disclose to any person or use for its own benefit, any such
     information. **Confidential Information** includes without limitation the
@@ -219,7 +202,7 @@ The Licensed Software includes
         remedies available, each Party shall be entitled to enforcement of such
         obligations by court injunction.
 
-18. During the Term, an independent, certified auditor on our behalf, may, upon
+17. During the Term, an independent, certified auditor on our behalf, may, upon
     its reasonable request, with 30 (thirty) days written notice, and at its
     sole expense, examine your books and records solely with respect to your use
     of the Licensed Software. Any such audit shall be conducted during regular
@@ -232,41 +215,36 @@ The Licensed Software includes
     of the terms of this Agreement, with a copy to you. You shall be provided
     the right to provide comments to the report before it is finalized.
 
-19. If you materially breach this Agreement, we will provide a 60 (sixty) days
+18. If you materially breach this Agreement, we will provide a 60 (sixty) days
     written notice to you during which any such breach(es) may be cured, failing
-    which we will terminate the agreement. You undertake to pay a contractual
-    penalty for each case of negligent breach of this Agreement of EUR 10000
-    (ten thousand euros), which shall not be subject to a judicial right of
-    reduction. We shall in any case be free to assert any further damage/loss or
-    other claims. The amount of contractual penalty shall be offset against
-    claims for damages, if any.
-
-20. You may terminate this Agreement at any time for any reason upon 90 (ninety)
+    which we will terminate the agreement.
+
+19. You may terminate this Agreement at any time for any reason upon 30 (thirty)
     days notice to us and upon payment of all applicable fees and contractual
     penalties, if any, in connection with the use of the Licensed Software.
 
-21. Both Parties shall comply with all applicable laws and regulations relating
+20. Both Parties shall comply with all applicable laws and regulations relating
     to the Licensed Software in the countries in which the Parties use or modify
     the Licensed Software.
 
-22. All notices and communications between the Parties shall be in writing and
+21. All notices and communications between the Parties shall be in writing and
     shall be deemed given when received. For avoidance of doubt, email is
     considered a written form of communication.
 
-23. This Agreement shall be construed, interpreted, and governed by the laws of
+22. This Agreement shall be construed, interpreted, and governed by the laws of
     the Federal Republic of Germany.
 
-24. No term or condition contained in your purchase order will apply unless
+23. No term or condition contained in your purchase order will apply unless
     expressly accepted by us in writing.
 
-25. You may assign this Agreement, in whole or in part (whether by operation of
+24. You may assign this Agreement, in whole or in part (whether by operation of
     law or otherwise), with prior consent from us, which shall not be
     unreasonably withheld or delayed. We may assign this Agreement or any of its
     rights hereunder or delegate any of its obligations hereunder with prior
     notice to you. Any attempt to assign this Agreement other than in accordance
     with this provision shall be null and void.
 
-26. This Agreement constitutes the complete agreement between the Parties and
+25. This Agreement constitutes the complete agreement between the Parties and
     supersedes all prior or contemporaneous discussions, representations, and
     proposals, written or oral, with respect to the subject matters discussed
     herein. No modification of this Agreement will be effective unless contained

package/README.md

@@ -2,11 +2,11 @@
 
 [![npm](https://img.shields.io/npm/v/slint-ui)](https://www.npmjs.com/package/slint-ui)
 
-[Slint](https://slint-ui.com/) is a UI toolkit that supports different programming languages.
+[Slint](https://slint.dev/) is a UI toolkit that supports different programming languages.
 Slint-node is the integration with node.
 
-The complete Node documentation can be viewed online at https://slint-ui.com/docs/node/.
-To get started you can use the [Walk-through tutorial](https://slint-ui.com/docs/tutorial/node).
+The complete Node documentation can be viewed online at https://slint.dev/docs/node/.
+To get started you can use the [Walk-through tutorial](https://slint.dev/docs/tutorial/node).
 We also have a [Getting Started Template](https://github.com/slint-ui/slint-nodejs-template) repository with
 the code of a minimal application using Slint that can be used as a starting point to your program.
 

package/cover.md

@@ -2,10 +2,10 @@
 
 [![npm](https://img.shields.io/npm/v/slint-ui)](https://www.npmjs.com/package/slint-ui)
 
-[Slint](https://slint-ui.com/) is a UI toolkit that supports different programming languages.
+[Slint](https://slint.dev/) is a UI toolkit that supports different programming languages.
 Slint-node is the integration with node.
 
-To get started you can use the [Walk-through tutorial](https://slint-ui.com/docs/tutorial/node).
+To get started you can use the [Walk-through tutorial](https://slint.dev/docs/tutorial/node).
 We also have a [Getting Started Template](https://github.com/slint-ui/slint-nodejs-template) repository with
 the code of a minimal application using Slint that can be used as a starting point to your program.
 

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
-// Copyright © SixtyFPS GmbH <info@slint-ui.com>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
 // Load the native library with `process.dlopen` instead of with `require`.
 // This is only done for autotest that do not require nom or neon_cli to
 // copy the lib to its right place

package/lib/index.ts

@@ -1,5 +1,5 @@
-// Copyright © SixtyFPS GmbH <info@slint-ui.com>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
 
 // Load the native library with `process.dlopen` instead of with `require`.
 // This is only done for autotest that do not require nom or neon_cli to

package/loader.mjs

@@ -1,5 +1,5 @@
-// Copyright © SixtyFPS GmbH <info@slint-ui.com>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
 
 import { URL, pathToFileURL } from 'url';
 

package/native/Cargo.toml

@@ -1,17 +1,17 @@
-# Copyright © SixtyFPS GmbH <info@slint-ui.com>
-# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
+# Copyright © SixtyFPS GmbH <info@slint.dev>
+# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
 
 [package]
 name = "slint-node"
-version = "1.0.1"
-authors = ["Slint Developers <info@slint-ui.com>"]
+version = "1.1.0"
+authors = ["Slint Developers <info@slint.dev>"]
 edition = "2021"
 build = "build.rs"
 # This is not meant to be used as a library from crate.io
 publish = false
-license = "GPL-3.0-only OR LicenseRef-Slint-commercial"
+license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial"
 repository = "https://github.com/slint-ui/slint"
-homepage = "https://slint-ui.com"
+homepage = "https://slint.dev"
 
 
 [lib]
@@ -20,9 +20,9 @@ crate-type = ["cdylib"]
 name = "slint_node_native"
 
 [dependencies]
-i-slint-compiler = { version = "=1.0.1"}
-i-slint-core = { version = "=1.0.1"}
-slint-interpreter = { version = "=1.0.1",  features = ["display-diagnostics"] }
+i-slint-compiler = { version = "=1.1.0"}
+i-slint-core = { version = "=1.1.0"}
+slint-interpreter = { version = "=1.1.0",  features = ["display-diagnostics"] }
 
 vtable = { version = "0.1.6"}
 

package/native/build.rs

@@ -1,5 +1,5 @@
-// Copyright © SixtyFPS GmbH <info@slint-ui.com>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
 
 fn main() {
     neon_build::setup();

package/native/js_model.rs

@@ -1,5 +1,5 @@
-// Copyright © SixtyFPS GmbH <info@slint-ui.com>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
 
 use i_slint_compiler::langtype::Type;
 use i_slint_core::model::Model;

package/native/lib.rs

@@ -1,5 +1,5 @@
-// Copyright © SixtyFPS GmbH <info@slint-ui.com>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
 
 use core::cell::RefCell;
 use i_slint_compiler::langtype::Type;
@@ -255,7 +255,8 @@ fn to_js_value<'cx>(
             &ImageInner::EmbeddedImage { .. }
             | &ImageInner::StaticTextures { .. }
             | &ImageInner::Svg(..)
-            | &ImageInner::BackendStorage(..) => JsNull::new().as_value(cx), // TODO: maybe pass around node buffers?
+            | &ImageInner::BackendStorage(..)
+            | &ImageInner::BorrowedOpenGLTexture(..) => JsNull::new().as_value(cx), // TODO: maybe pass around node buffers?
         },
         Value::Model(model) => {
             if let Some(js_model) = model.as_any().downcast_ref::<js_model::JsModel>() {
@@ -490,7 +491,9 @@ declare_types! {
             let this = cx.this();
             let window = cx.borrow(&this, |x| x.0.as_ref().cloned());
             let window_adapter = window.ok_or(()).or_else(|()| cx.throw_error("Invalid type"))?;
-            window_adapter.show().unwrap();
+            if let Some(window_adapter) = window_adapter.internal(i_slint_core::InternalToken) {
+                window_adapter.show().unwrap();
+            }
             Ok(JsUndefined::new().as_value(&mut cx))
         }
 
@@ -498,7 +501,9 @@ declare_types! {
             let this = cx.this();
             let window = cx.borrow(&this, |x| x.0.as_ref().cloned());
             let window_adapter = window.ok_or(()).or_else(|()| cx.throw_error("Invalid type"))?;
-            window_adapter.hide().unwrap();
+            if let Some(window_adapter) = window_adapter.internal(i_slint_core::InternalToken) {
+                window_adapter.hide().unwrap();
+            }
             Ok(JsUndefined::new().as_value(&mut cx))
         }
 
@@ -513,7 +518,7 @@ declare_types! {
             let this = cx.this();
             let window = cx.borrow(&this, |x| x.0.as_ref().cloned());
             let window_adapter = window.ok_or(()).or_else(|()| cx.throw_error("Invalid type"))?;
-            let pos = window_adapter.position().to_logical(window_adapter.window().scale_factor());
+            let pos = window_adapter.position().unwrap_or_default().to_logical(window_adapter.window().scale_factor());
 
             let point_object = JsObject::new(&mut cx);
             let x_value = JsNumber::new(&mut cx, pos.x).as_value(&mut cx);
@@ -527,7 +532,7 @@ declare_types! {
             let this = cx.this();
             let window = cx.borrow(&this, |x| x.0.as_ref().cloned());
             let window_adapter = window.ok_or(()).or_else(|()| cx.throw_error("Invalid type"))?;
-            let pos = window_adapter.position();
+            let pos = window_adapter.position().unwrap_or_default();
 
             let point_object = JsObject::new(&mut cx);
             let x_value = JsNumber::new(&mut cx, pos.x).as_value(&mut cx);

package/native/persistent_context.rs

@@ -1,5 +1,5 @@
-// Copyright © SixtyFPS GmbH <info@slint-ui.com>
-// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial
+// Copyright © SixtyFPS GmbH <info@slint.dev>
+// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.0 OR LicenseRef-Slint-commercial
 
 /*!
 Since neon does not allow to have a persistent handle, use this hack.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "slint-ui",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "homepage": "https://github.com/slint-ui/slint",
     "license": "SEE LICENSE IN LICENSE.md",
     "repository": {