Merge remote-tracking branch 'origin/dev' into fix-windows-white-flash

Author: FabianLars

.github/workflows/covector-version-or-publish.yml

@@ -52,3 +52,4 @@ jobs:
           labels: "version updates"
           branch: "release"
           body: ${{ steps.covector.outputs.change }}
+          sign-commits: true

CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## \[0.34.5]
+
+- [`92e22209`](https://github.com/tauri-apps/tao/commit/92e22209fb58248449175b5b86697243d6a93db2) ([#1152](https://github.com/tauri-apps/tao/pull/1152) by [@lucasfernog](https://github.com/tauri-apps/tao/../../lucasfernog)) Emit `Event::LoopDestroyed` on activity destroy on Android.
+- [`da1514be`](https://github.com/tauri-apps/tao/commit/da1514be09993ea4aace8c64cfdf0af14f22b818) ([#1150](https://github.com/tauri-apps/tao/pull/1150) by [@Legend-Master](https://github.com/tauri-apps/tao/../../Legend-Master)) Fix maximized windows have empty edges when using auto hide task bar on Windows
+
+## \[0.34.4]
+
+- [`25f2c58a`](https://github.com/tauri-apps/tao/commit/25f2c58aca96215113d1a4feae5c854e3349cf06) ([#1148](https://github.com/tauri-apps/tao/pull/1148) by [@lucasfernog](https://github.com/tauri-apps/tao/../../lucasfernog)) Trigger `WindowEvent::Destroyed` when the Android activity is destroyed. In this case, the app should either exit by setting the control flow to `ControlFlow::ExitWithCode` or NOT call the create() external function when the activity is recreated and `onCreate` is called, handling how to recreate the app window via a separate hook that can leverage the existing tao event loop.
+
+## \[0.34.3]
+
+- [`0defcd01`](https://github.com/tauri-apps/tao/commit/0defcd015c615b95f42ce3437b06174816f76602) ([#1132](https://github.com/tauri-apps/tao/pull/1132) by [@Legend-Master](https://github.com/tauri-apps/tao/../../Legend-Master)) Exclude audit PDF file from the crate published to crates.io
+- [`3969a1a4`](https://github.com/tauri-apps/tao/commit/3969a1a45cfe2e173431eb1134b49e03c30bdc32) ([#1138](https://github.com/tauri-apps/tao/pull/1138) by [@aspcartman](https://github.com/tauri-apps/tao/../../aspcartman)) On macOS, fixed an issue that caused the window background color to be applied incorrectly (typically black).
+- [`28f5a96a`](https://github.com/tauri-apps/tao/commit/28f5a96a7d80859d97a84586b6c68fd4daac05d4) ([#1119](https://github.com/tauri-apps/tao/pull/1119) by [@Legend-Master](https://github.com/tauri-apps/tao/../../Legend-Master)) Fix `WindowEvent::MouseWheel` doesn't account for mouse wheel speed settings
+- [`a1edbeb4`](https://github.com/tauri-apps/tao/commit/a1edbeb448d1104b8e9dd3181a04d45ff846a397) ([#1126](https://github.com/tauri-apps/tao/pull/1126) by [@Legend-Master](https://github.com/tauri-apps/tao/../../Legend-Master)) Emit `Event::LoopDestroyed` on receiving `WM_ENDSESSION` message on Windows
+
+## \[0.34.2]
+
+- [`60a47340`](https://github.com/tauri-apps/tao/commit/60a47340c967eaaf5b4a41f0be6708d6daf950e3) ([#1108](https://github.com/tauri-apps/tao/pull/1108) by [@Simon-Laux](https://github.com/tauri-apps/tao/../../Simon-Laux)) feat: MacOS: add universal applink support
+  by implementing `application:willContinueUserActivityWithType:` and `application:continueUserActivity:restorationHandler:`,
+  reusing the existing `Event::Opened { urls }` event for the user facing api.
+
+## \[0.34.1]
+
+- [`f73c70fd`](https://github.com/tauri-apps/tao/commit/f73c70fd870016dc1298599cdbc9bcaa8db5d7bf) ([#1120](https://github.com/tauri-apps/tao/pull/1120) by [@robertrpf](https://github.com/tauri-apps/tao/../../robertrpf)) Added `WindowBuilder::with_focusable` to allow creating unfocusable windows.
+- [`f73c70fd`](https://github.com/tauri-apps/tao/commit/f73c70fd870016dc1298599cdbc9bcaa8db5d7bf) ([#1120](https://github.com/tauri-apps/tao/pull/1120) by [@robertrpf](https://github.com/tauri-apps/tao/../../robertrpf)) Added `Window::set_focusable`.
+
 ## \[0.34.0]
 
 - [`773d324b`](https://github.com/tauri-apps/tao/commit/773d324be5462fbe472b9bec7505bb04bdc1cf9a) ([#1121](https://github.com/tauri-apps/tao/pull/1121) by [@FabianLars](https://github.com/tauri-apps/tao/../../FabianLars)) Fixed an issue that caused a panic on macOS when tao received `nil` from the OS when trying to get the current NSScreen.

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "tao"
-version = "0.34.0"
+version = "0.34.5"
 description = "Cross-platform window manager library."
 authors = [
   "Tauri Programme within The Commons Conservancy",
@@ -14,6 +14,7 @@ readme = "README.md"
 repository = "https://github.com/tauri-apps/tao"
 documentation = "https://docs.rs/tao"
 categories = [ "gui" ]
+include = ["/README.md", "src/**/*.rs", "examples/**/*.rs", "LICENSE*"]
 
 [package.metadata.docs.rs]
 features = [ "rwh_04", "rwh_05", "rwh_06", "serde", "x11" ]
@@ -106,6 +107,7 @@ tao-macros = { version = "0.1.0", path = "./tao-macros" }
 
 [target."cfg(any(target_os = \"ios\", target_os = \"macos\"))".dependencies]
 objc2 = "0.6"
+block2 = "0.6"
 
 [target."cfg(target_os = \"macos\")".dependencies]
 objc2-foundation = { version = "0.3", default-features = false, features = [
@@ -140,6 +142,7 @@ objc2-app-kit = { version = "0.3", default-features = false, features = [
   "NSScreen",
   "NSView",
   "NSWindow",
+  "NSUserActivity"
 ] }
 core-foundation = "0.10"
 core-graphics = "0.24"
@@ -152,4 +155,4 @@ gdkx11-sys = { version = "0.18", optional = true }
 gdkwayland-sys = "0.18.0"
 x11-dl = { version = "2.21", optional = true }
 parking_lot = "0.12"
-dlopen2 = "0.7.0"
+dlopen2 = "0.8.0"

Cargo.toml

@@ -2,8 +2,7 @@
 // Copyright 2021-2023 Tauri Programme within The Commons Conservancy
 // SPDX-License-Identifier: Apache-2.0
 
-use std::time::Duration;
-use std::time::Instant;
+use std::time::{Duration, Instant};
 
 use tao::{
   event::{Event, StartCause, WindowEvent},

examples/timer.rs

@@ -13,8 +13,7 @@
 //! [create_proxy]: crate::event_loop::EventLoop::create_proxy
 //! [event_loop_proxy]: crate::event_loop::EventLoopProxy
 //! [send_event]: crate::event_loop::EventLoopProxy::send_event
-use std::time::Instant;
-use std::{error, fmt, marker::PhantomData, ops::Deref};
+use std::{error, fmt, marker::PhantomData, ops::Deref, time::Instant};
 
 use crate::{
   dpi::PhysicalPosition,

src/event_loop.rs

@@ -184,6 +184,17 @@ impl<T: 'static> EventLoop<T> {
               }
             );
           }
+          Event::Destroy => {
+            call_event_handler!(
+              event_handler,
+              self.window_target(),
+              control_flow,
+              event::Event::WindowEvent {
+                window_id: window::WindowId(WindowId),
+                event: event::WindowEvent::Destroyed,
+              }
+            );
+          }
           _ => {}
         },
         Some(EventSource::InputQueue) => {
@@ -335,6 +346,14 @@ impl<T: 'static> EventLoop<T> {
             start: Instant::now(),
             requested_resume: None,
           };
+
+          call_event_handler!(
+            event_handler,
+            self.window_target(),
+            control_flow,
+            event::Event::LoopDestroyed
+          );
+
           break 'event_loop code;
         }
         ControlFlow::Poll => {
@@ -564,6 +583,10 @@ impl Window {
     warn!("set_focus not yet implemented on Android");
   }
 
+  pub fn set_focusable(&self, _focusable: bool) {
+    warn!("set_focusable not yet implemented on Android");
+  }
+
   pub fn is_focused(&self) -> bool {
     log::warn!("`Window::is_focused` is ignored on Android");
     false

src/platform_impl/android/mod.rs

@@ -47,6 +47,7 @@ pub static PACKAGE: OnceCell<&str> = OnceCell::new();
 ///       - `private external fun focus(focus: Boolean)`
 /// 4. a one time setup function that will be ran once after tao has created its event loop in the `create` function above.
 /// 5. the main entry point of your android application.
+#[rustfmt::skip]
 #[macro_export]
 macro_rules! android_binding {
   ($domain:ident, $package:ident, $activity:ident, $setup:path, $main:ident) => {

src/platform_impl/android/ndk_glue.rs

@@ -72,6 +72,10 @@ impl Inner {
     warn!("set_focus not yet implemented on iOS");
   }
 
+  pub fn set_focusable(&self, _focusable: bool) {
+    warn!("set_focusable not yet implemented on iOS");
+  }
+
   pub fn is_focused(&self) -> bool {
     warn!("`Window::is_focused` is ignored on iOS");
     false

src/platform_impl/ios/window.rs

@@ -87,7 +87,7 @@ impl Window {
 
     let mut window_builder = gtk::ApplicationWindow::builder()
       .application(app)
-      .accept_focus(attributes.focused);
+      .accept_focus(attributes.focusable && attributes.focused);
     if let Parent::ChildOf(parent) = pl_attribs.parent {
       window_builder = window_builder.transient_for(&parent);
     }
@@ -231,8 +231,8 @@ impl Window {
     }
 
     // restore accept-focus after the window has been drawn
-    // if the window was initially created without focus
-    if !attributes.focused {
+    // if the window was initially created without focus and is supposed to be focusable
+    if attributes.focusable && !attributes.focused {
       let signal_id = Arc::new(RefCell::new(None));
       let signal_id_ = signal_id.clone();
       let id = window.connect_draw(move |window, _| {
@@ -594,6 +594,10 @@ impl Window {
     }
   }
 
+  pub fn set_focusable(&self, focusable: bool) {
+    self.window.set_accept_focus(focusable);
+  }
+
   pub fn is_focused(&self) -> bool {
     self.window.is_active()
   }