Merge next back to dev branch (rust-windowing#305)

* refactor(windows): `begin_resize_drag` now similar to gtk's (rust-windowing#200) * refactor(windows): `begin_resize_drag` now similart to gtk's * fix * feat(linux): skipping taskbar will now also skip pager (rust-windowing#198) * refactor(linux): clean dummy device_id (rust-windowing#195) * refactor(linux): clean dummy device_id * fmt * feat(linux): allow resizing undecorated window using touch (rust-windowing#199) * refactor(windows): only skip taskbar if needed when `set_visible` is called (rust-windowing#196) * fix: increase borderless resizing inset (rust-windowing#202) * fix: increase borderless resizing inset * update some comments * Replace winapi with windows crate bindings shared with WRY (rust-windowing#206) * fix(deps): update rust crate libayatana-appindicator to 0.1.6 (rust-windowing#190) Co-authored-by: Renovate Bot <bot@renovateapp.com> * Add Windows crate and webview2-com-sys bindings * Initial port to webview2-com-sys * Finish conversion and remove winapi * Fix renamed lint warning * Fix all match arms referencing const variables * Put back the assert instead of expect * Point to the published version of webview2-com-sys * Cleanup slightly weird BOOL handling * Replace mem::zeroed with Default::default * Add a summary in .changes * Remove extra projects not in config.json * Fix clippy warnings * Update to 32-bit compatible webview2-com-sys * Better fix for merge conflict * Fix clippy errors on Windows * Use path prefix to prevent variable shadowing * Fix Windows clippy warnings with nightly toolchain * Fix Linux nightly/stable clippy warnings * Fix macOS nightly/stable clippy warnings * Put back public *mut libc::c_void for consistency * Re-run cargo fmt * Move call_default_window_proc to util mod * Remove unnecessary util::to_wstring calls * Don't repeat LRESULT expression in match arms * Replace bitwise operations with util functions * Cleanup more bit mask & shift with util fns * Prefer from conversions instead of as cast * Implement get_xbutton_wparam * Use *mut libc::c_void for return types Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renovate Bot <bot@renovateapp.com> * fix(keyboard): add mapping for space key on Windows (rust-windowing#209) * fix(keyboard): add mapping for space key on Windows * change file * feat: impl Clone for EventLoopWindowTarget (rust-windowing#211) * chore: add `on_issue_closed.yml` (rust-windowing#214) * Update tray dependency version (rust-windowing#217) * Delete on_issue_closed.yml (rust-windowing#221) * refactor(linux): event loop (rust-windowing#233) * Use crossbeam::channel * Fix crossbeam channel import * Add check on poll event * Fix deadlock when unregistering shortcut on Linux (rust-windowing#230) * Add fullscreen monitor selection support on Linux (rust-windowing#235) * Add fullscreen monitor support on Linux * Add change file * Remove todo on videomode * Fix clippy * Update to 2021 edition (rust-windowing#236) * Update to 2021 edition * Fix clippy * Add run_return on Linux (rust-windowing#237) * Add run_return on Linux * Add main context * Add run_return trait on Linux (rust-windowing#238) * Fix: rust-windowing#239 Update webview2-com and windows crates (rust-windowing#240) * Replace webivew2-com-sys with prebuilt windows * Use windows utility instead of direct GetLastError * Bump windows version and add changelog * Run cargo fmt * Restore inverted matches macro * Scope constants in match arms * Fix inverted null check * Update src/platform_impl/windows/util.rs Co-authored-by: Amr Bashir <48618675+amrbashir@users.noreply.github.com> * Use env_logger instead of simple_logger (rust-windowing#241) * Use env_logger instead of simple_logger * Make clippy happy * Cherry pick commits to next (rust-windowing#244) * feat(macos): Add `unhide_application` method, closes rust-windowing#182 (rust-windowing#231) * feat(macos): Add `unhide_application` method * Update src/platform/macos.rs Co-authored-by: Amr Bashir <48618675+amrbashir@users.noreply.github.com> * Reanme to `show_application()` * Remove broken doc link Co-authored-by: Amr Bashir <48618675+amrbashir@users.noreply.github.com> * feat: Allow more strings to parse to keycode (rust-windowing#229) * feat: support accelerator key strings `,` `-` `.` `Space` `Tab` and `F13`-`F24` (rust-windowing#228) * feat(macOS): support more accelerator key strings * Move function keys together * Add `,` `-` `.` `Space` `F20-F24` for Windows * Remove support for accelerators not found in `winapi` * Add `,` `-` `.` `Space` `F13-F24` for Linux * Update .changes * Add the rest for Windows * Add the rest for Linux * Add the rest on macOS * Update accelerator-strings.md * Fix git comments Co-authored-by: Kasper <kasperkh.kh@gmail.com> Co-authored-by: Amr Bashir <48618675+amrbashir@users.noreply.github.com> * Add redraw events on Linux (rust-windowing#245) * Add redraw events on Linux * Update doc of RequestRedraw Event * Add change file * Fix missing menu bar on borderless window (rust-windowing#247) Credit goes to irh's work on winit commit f2de847 * refactor: improve `set_skip_taskbar` impl on Windows (rust-windowing#250) * fix: emit errors on parsing an invalid accelerator for string, closes rust-windowing#135 (rust-windowing#252) * chore: update comment * fix(linux): fix focus events not firing properly (rust-windowing#253) * fix(linux): fix focus events not firing properly * add changelog * chore: update focus events error message * chore: fmt * fix: revert windows-rs 0.28 version bump * fix(linux): fix native menu items (rust-windowing#256) * chore: remove examples commited by accident * Update `ReceivedImeText` (rust-windowing#251) * Allow receiving text without Ime on Windows * Avoid panic todo * Receive text without ime on mac * Fix CursorMoved event on Linux * Add ReceivedImeText on Linux This only add Simple IME from GTK for now. We should add the actual IME from system in the future. * Fix redraw event that causes inifinite loop (rust-windowing#260) * Fix redraw event that causes inifinite loop * Refactor event loop * Remove unused function * Add doc comment on linux's run_return * Ignore doc test on run_return * Add non blocking iteration on Linux (rust-windowing#261) * Docs: SystemTrayExtWindows::remove() is gone (rust-windowing#262) Fix docs following rust-windowing#153 * Fix busy loop on Linux (rust-windowing#265) * Update windows crate to 0.29.0 (rust-windowing#266) * Update to windows 0.29.0 * Add change description * Remove clippy check (rust-windowing#267) * refactor(windows): align util function with win32 names * chore: update PR template * fix(linux): fire resized & moved events on min/maximize, closes rust-windowing#219 (rust-windowing#254) * feat(linux): implement `raw_window_handle()` (rust-windowing#269) * chore(deps): update to raw-window-handle 0.4 * add linux raw-window-handle support * update macos/ios/android * fix ios * Fix core-video-sys dependency (rust-windowing#274) * The `cocoa` crate links to AppKit, which made the symbol `CGDisplayCreateUUIDFromDisplayID` from ApplicationServices/ColorSync (which AppKit uses internally) available to us on macOS 10.8 to 10.13. (rust-windowing#275) However, this does not work on macOS 10.7 (where AppKit does not link to ColorSync internally). Instead of relying on this, we should just link to ApplicationServices directly. * Fix some invalid msg_send! usage (rust-windowing#276) * Revert "Fix some invalid msg_send! usage (rust-windowing#276)" (rust-windowing#277) This reverts commit a3a2e0cfc49ddfa8cdf65cf9870fb8e3d45b4bc0. * Revert "The `cocoa` crate links to AppKit, which made the symbol `CGDisplayCreateUUIDFromDisplayID` from ApplicationServices/ColorSync (which AppKit uses internally) available to us on macOS 10.8 to 10.13. (rust-windowing#275)" (rust-windowing#279) This reverts commit 6f9c468f26ddb60e29be2139397bfaf3b30eab1e. * The `cocoa` crate links to AppKit, which made the symbol `CGDisplayCreateUUIDFromDisplayID` from ApplicationServices/ColorSync (which AppKit uses internally) available to us on macOS 10.8 to 10.13. (rust-windowing#280) However, this does not work on macOS 10.7 (where AppKit does not link to ColorSync internally). Instead of relying on this, we should just link to ApplicationServices directly. Co-authored-by: madsmtm <mads@marquart.dk> * Fix some invalid msg_send! usage (rust-windowing#278) Co-authored-by: madsmtm <mads@marquart.dk> * Add exit code to ControlFlow::Exit (rust-windowing#281) * Add exit code to ControlFlow::Exit * Cargo fmt * Add change files Co-authored-by: multisn8 <contact@multisamplednight.com> * Add new_any_thread to Unix event loop (rust-windowing#282) * Update windows crate to 0.30.0 (rust-windowing#283) * Update windows crate to 0.30.0 * Simplify new-type usage * Fix boxing in GWL_USERDATA * Make sure everyone is using Get/SetWindowLongPtrW * build the system_tray module when "ayatana" feature is enabled (rust-windowing#285) Without those cfg feature checks, the "ayatana" feature does actually not enable anything. * Fix click events missing whe tray has menu (rust-windowing#291) * Fix click events missing whe tray has menu * Add change file * Fix crash when tray has no menu (rust-windowing#294) * chore: update pull request commit exmple * fix(windows): send correct position for system tray events, closes rust-windowing#295 (rust-windowing#300) * fix(windows): revert maximized state handling to winit impl, closes rust-windowing#193 (rust-windowing#299) * fix(windows): revet maximized state handling to winit impl, closes rust-windowing#193 * add chanefile [skip ci] * fix: `MenuItem::Quit` on Windows (rust-windowing#303) * fix: `MenuItem::Close` on Windows * use `PostQuitMessage` instead Co-authored-by: amrbashir <amr.bashir2015@gmail.com> * feat: v1 audit by Radically Open Security (rust-windowing#304) * Update to gtk 0.15 (rust-windowing#288) * Update to gtk 0.15 * Fix picky none on set_geometry_hint * Fix CursorMoved position Co-authored-by: Amr Bashir <48618675+amrbashir@users.noreply.github.com> Co-authored-by: Bill Avery <wravery@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Lucas Fernandes Nogueira <lucasfernandesnog@gmail.com> Co-authored-by: Kasper <kasperkh.kh@gmail.com> Co-authored-by: amrbashir <amr.bashir2015@gmail.com> Co-authored-by: Jay Oster <jay@kodewerx.org> Co-authored-by: madsmtm <mads@marquart.dk> Co-authored-by: multisn8 <contact@multisamplednight.com> Co-authored-by: Aurélien Jacobs <aurel@gnuage.org> Co-authored-by: Lucas Fernandes Nogueira <lucas@tauri.studio>
madsmtm · Feb 5, 2022 · 0dd7197 · 0dd7197
1 parent 9da2f15
commit 0dd7197
Show file tree

Hide file tree

Showing 130 changed files with 4,196 additions and 3,717 deletions.
diff --git a/.changes/15.md b/.changes/15.md
@@ -0,0 +1,5 @@
+---
+"tao": minor
+---
+
+Update to gtk 0.15
diff --git a/.changes/accelerator-error.md b/.changes/accelerator-error.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Emit errors when parsing an invalid accelerator from a string.
diff --git a/.changes/accelerator-strings.md b/.changes/accelerator-strings.md
@@ -0,0 +1,5 @@
+---
+tao: minor
+---
+
+Add support for more accelerator keys: `,` `-` `.` `=` `;` `/` `\` `'` `` ` `` `[` `]` `Space` `Tab` and `F13`-`F24`
diff --git a/.changes/borderless-resizing-inset.md b/.changes/borderless-resizing-inset.md
@@ -0,0 +1,4 @@
+---
+"tao": patch
+---
+Increased Borderless window resizing inset.
diff --git a/.changes/edition.md b/.changes/edition.md
@@ -0,0 +1,6 @@
+---
+"tao": patch
+---
+
+Update to 2021 edition and msrv to 1.56
+
diff --git a/.changes/exit_with_code.md b/.changes/exit_with_code.md
@@ -0,0 +1,5 @@
+---
+"tao": minor
+---
+
+**Breaking:** Rename the `Exit` variant of `ControlFlow` to `ExitWithCode`, which holds a value to control the exit code after running. Add an `Exit` constant which aliases to `ExitWithCode(0)` instead to avoid major breakage. This shouldn't affect most existing programs.
diff --git a/.changes/fix-quit-menuitem-windows.md b/.changes/fix-quit-menuitem-windows.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Fixes the `MenuItem::Quit` behavior on Windows.
diff --git a/.changes/keyboard-windows-space.md b/.changes/keyboard-windows-space.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Add support for `SPACE` shortcut key on Windows.
diff --git a/.changes/linux-fix-loop.md b/.changes/linux-fix-loop.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+* Fix redrawn event that causing infinite lopp on Linux
diff --git a/.changes/linux-fix-native-menu-items.md b/.changes/linux-fix-native-menu-items.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Fix linux native menu items not working.
diff --git a/.changes/linux-fix-undecorated-resize.md b/.changes/linux-fix-undecorated-resize.md
@@ -0,0 +1,6 @@
+---
+"tao": patch
+---
+
+* Fix resizing undecorated window on Linux.
+* Undecorated window can be resized using touch on Linux.
diff --git a/.changes/linux-focus-events.md b/.changes/linux-focus-events.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Fix focus events not firing on Linux
diff --git a/.changes/linux-monitor.md b/.changes/linux-monitor.md
@@ -0,0 +1,6 @@
+---
+"tao": patch
+---
+
+Add monitor selection when fullscreen on Linux and close possible way to create VideoMode on Linux since gtk doesn't acutally have such feature.
+
diff --git a/.changes/linux-redraw.md b/.changes/linux-redraw.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+* Add `RedrawEventsCleared` and `RedrawRequested` on Linux
diff --git a/.changes/linux-run-return.md b/.changes/linux-run-return.md
@@ -0,0 +1,6 @@
+---
+"tao": patch
+---
+
+Add run_return trait on Linux
+
diff --git a/.changes/linux-skip-taskbar-skips-pages.md b/.changes/linux-skip-taskbar-skips-pages.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+`window.set_skip_taskbar()` on Linux will now also skip the pager (Alt+Tab), this matches the behavior on Windows.
diff --git a/.changes/linux-tray.md b/.changes/linux-tray.md
@@ -0,0 +1,6 @@
+---
+"tao": patch
+---
+
+Update tray dependency version.
+
diff --git a/.changes/linux-unreg.md b/.changes/linux-unreg.md
@@ -0,0 +1,6 @@
+---
+"tao": patch
+---
+
+Fix deadlock when unregistering shortcut on Linux.
+
diff --git a/.changes/linx-moved-resized-on-min-maximized.md b/.changes/linx-moved-resized-on-min-maximized.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Fire `WindowEvent::Resized` and `WindowEvent::Moved` when window is min/maximized on Linux to align with Windows behavior.
diff --git a/.changes/mac-borderless-menu.md b/.changes/mac-borderless-menu.md
@@ -0,0 +1,6 @@
+---
+"tao": patch
+---
+
+Fix menubar missing on borderless window.
+
diff --git a/.changes/mac-core-video-sys.md b/.changes/mac-core-video-sys.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Fix core-video-sys dependency.
diff --git a/.changes/mac-link.md b/.changes/mac-link.md
@@ -0,0 +1,6 @@
+---
+"tao": patch
+---
+
+Fix linking to the `ColorSync` framework on macOS 10.7, and in newer Rust versions.
+
diff --git a/.changes/parse-more-keycode-strings.md b/.changes/parse-more-keycode-strings.md
@@ -0,0 +1,5 @@
+---
+tao: minor
+---
+
+Allow more strings to parse to keycode, for example `,` is now parsed as a comma.
diff --git a/.changes/raw-window-handle.md b/.changes/raw-window-handle.md
@@ -0,0 +1,6 @@
+---
+"tao": patch
+---
+
+* Update `raw-window-handle` to `0.4`
+* Add `raw_window_handle()` implementation on linux.
diff --git a/.changes/tray-mac.md b/.changes/tray-mac.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Fix click events missing whe tray has menu.
diff --git a/.changes/unhide-applications.md b/.changes/unhide-applications.md
@@ -0,0 +1,5 @@
+---
+tao: minor
+---
+
+Add macOS `show_application()` method
diff --git a/.changes/unix_new_any_thread.md b/.changes/unix_new_any_thread.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Add new_any_thread to Unix event loop.
diff --git a/.changes/webview2-com-sys.md b/.changes/webview2-com-sys.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Replace all of the `winapi` crate references with the `windows` crate. The generated bindings are in the `webview2-com-sys` crate to share types with WRY later.
diff --git a/.changes/window-target-clone.md b/.changes/window-target-clone.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Implement `Clone` for `EventLoopWindowTarget`.
diff --git a/.changes/windows-0.25.0.md b/.changes/windows-0.25.0.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Update the `windows` crate to 0.25.0, which comes with pre-built libraries. Tao no longer depends on `webview2-com-sys` to generate bindings shared with WRY.
diff --git a/.changes/windows-0.29.0.md b/.changes/windows-0.29.0.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Update the `windows` crate to 0.29.0.
diff --git a/.changes/windows-0.30.0.md b/.changes/windows-0.30.0.md
@@ -0,0 +1,5 @@
+---
+"tao": patch
+---
+
+Update the `windows` crate to 0.30.0. This version re-introduced a lot of new-types for things like HWND, LRESULT, WPARAM, LPARAM, etc.
diff --git a/.changes/windows-fix-maximized-state.md b/.changes/windows-fix-maximized-state.md
@@ -0,0 +1,5 @@
+---
+"tao": "patch"
+---
+
+Fix using `WindowBuilder::with_visible` and `WindowBuilder::with_maximized` not behaving correctly.
diff --git a/.changes/windows-system-tray-event-position.md b/.changes/windows-system-tray-event-position.md
@@ -0,0 +1,5 @@
+---
+"tao": "patch"
+---
+
+On Windows, send correct position on system tray events.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,36 +1,30 @@
 <!--
-Please make sure to read the Pull Request Guidelines:
-https://github.com/tauri-apps/tauri/blob/dev/.github/CONTRIBUTING.md#pull-request-guidelines
--->
+Update "[ ]" to "[x]" to check a box
 
-<!-- PULL REQUEST TEMPLATE -->
-<!-- (Update "[ ]" to "[x]" to check a box) -->
+Please make sure to read the Pull Request Guidelines: https://github.com/tauri-apps/tauri/blob/dev/.github/CONTRIBUTING.md#pull-request-guidelines
+-->
 
-**What kind of change does this PR introduce?** (check at least one)
+### What kind of change does this PR introduce?
+<!-- Check at least one. If you are introducing a new binding, you must reference an issue where this binding has been proposed, discussed and approved by the maintainers. -->
 
 - [ ] Bugfix
 - [ ] Feature
+- [ ] Docs
+- [ ] New Binding issue #___
 - [ ] Code style update
 - [ ] Refactor
-- [ ] Documentation
 - [ ] Build-related changes
 - [ ] Other, please describe:
 
-**Does this PR introduce a breaking change?** (check one)
-<!--
-If yes, please describe the impact and migration path for existing applications in an attached issue. Filing a PR with breaking changes that has not been discussed and approved by the maintainers in an issue will be immediately closed.
--->
+### Does this PR introduce a breaking change?
+<!-- If yes, please describe the impact and migration path for existing applications in an attached issue. -->
 
-- [ ] Yes. Issue #___
+- [ ] Yes, and the changes were approved in issue #___
 - [ ] No
 
-
-**The PR fulfills these requirements:**
-
-- [ ] When resolving a specific issue, it's referenced in the PR's title (e.g. `fix: #xxx[,#xxx]`, where "xxx" is the issue number)
+### Checklist
+- [ ] When resolving issues, they are referenced in the PR's title (e.g `fix: remove a typo, closes #___, #___`)
 - [ ] A change file is added if any packages will require a version bump due to this PR per [the instructions in the readme](https://github.com/tauri-apps/tauri/blob/dev/.changes/readme.md).
+- [ ] I have added a convincing reason for adding this feature, if necessary
 
-If adding a **new feature**, the PR's description includes:
-- [ ] A convincing reason for adding this feature (to avoid wasting your time, it's best to open a suggestion issue first and wait for approval before working on it)
-
-**Other information:**
+### Other information
diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml
@@ -15,14 +15,9 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
             profile: minimal
-            toolchain: nightly
+            toolchain: stable
             override: true
-            components: rustfmt, clippy
-      - name: clippy check
-        uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --all-targets -- -D warnings
+            components: rustfmt
       - name: fmt
         uses: actions-rs/cargo@v1
         with: