fix(macos): do not fire Event::Moved when checking is_maximized #366
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
To test the issue, use this wry example: use tao::window::WindowId;
// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
fn main() -> wry::Result<()> {
use wry::{
application::{
event::{Event, WindowEvent},
event_loop::{ControlFlow, EventLoop},
window::{Window, WindowBuilder},
},
webview::WebViewBuilder,
};
enum UserEvents {
CloseWindow(WindowId),
}
let event_loop = EventLoop::<UserEvents>::with_user_event();
let mut webviews = std::collections::HashMap::new();
let window = WindowBuilder::new()
.with_decorations(false)
.build(&event_loop)
.unwrap();
let url = r#"data:text/html,
<body>
<div class='titlebar'>
<div class="drag-region left">Awesome WRY Window</div>
<div class="right">
<div class="titlebar-button" id="minimize">
<img src="https://api.iconify.design/codicon:chrome-minimize.svg" />
</div>
<div class="titlebar-button" id="maximize">
<img src="https://api.iconify.design/codicon:chrome-maximize.svg" />
</div>
<div class="titlebar-button" id="close">
<img src="https://api.iconify.design/codicon:close.svg" />
</div>
</div>
</div>
<div>
<p> WRYYYYYYYYYYYYYYYYYYYYYY! </p>
<button style="cursor: pointer"> Hover me! </button>
</div>
</body>
"#;
let script = r#"
(function () {
window.addEventListener('DOMContentLoaded', (event) => {
document.getElementById('minimize').addEventListener('click', () => ipc.postMessage('minimize'));
document.getElementById('maximize').addEventListener('click', () => ipc.postMessage('maximize'));
document.getElementById('close').addEventListener('click', () => ipc.postMessage('close'));
document.addEventListener('mousedown', (e) => {
if (e.target.classList.contains('drag-region') && e.buttons === 1) {
e.detail === 2
? window.ipc.postMessage('maximize')
: window.ipc.postMessage('drag_window');
}
})
document.addEventListener('touchstart', (e) => {
if (e.target.classList.contains('drag-region')) {
window.ipc.postMessage('drag_window');
}
})
const style = document.createElement('style');
style.textContent = `
* {
padding: 0;
margin: 0;
box-sizing: border-box;
}
.titlebar {
height: 30px;
display: grid;
grid-auto-flow: column;
grid-template-columns: 1fr max-content max-content max-content;
align-items: center;
background: #1F1F1F;
color: white;
user-select: none;
}
.titlebar-button {
display: inline-flex;
justify-content: center;
align-items: center;
width: 30px;
height: 30px;
}
.titlebar-button:hover {
background: #3b3b3b;
}
.titlebar-button:nth-child(3):hover {
background: #da3d3d;
}
.titlebar-button img {
filter: invert(100%);
}
`;
document.head.append(style);
});
})();
"#;
let proxy = event_loop.create_proxy();
let handler = move |window: &Window, req: String| {
if req == "minimize" {
window.set_minimized(true);
}
if req == "maximize" {
window.set_maximized(!window.is_maximized());
}
if req == "close" {
let _ = proxy.send_event(UserEvents::CloseWindow(window.id()));
}
if req == "drag_window" {
let _ = window.drag_window();
}
};
let webview = WebViewBuilder::new(window)
.unwrap()
.with_url(url)?
.with_initialization_script(script)
.with_ipc_handler(handler)
.build()?;
webviews.insert(webview.window().id(), webview);
event_loop.run(move |event, _, control_flow| {
*control_flow = ControlFlow::Wait;
match event {
Event::WindowEvent {
event, window_id, ..
} => match event {
WindowEvent::Moved(p) => {
println!("moved {:?}", p);
}
WindowEvent::CloseRequested => {
webviews.remove(&window_id);
if webviews.is_empty() {
*control_flow = ControlFlow::Exit
}
}
WindowEvent::Resized(_) => {
println!(
"resized, is maximized? {}",
webviews[&window_id].window().is_maximized()
);
let _ = webviews[&window_id].resize();
}
_ => (),
},
Event::UserEvent(UserEvents::CloseWindow(id)) => {
webviews.remove(&id);
if webviews.is_empty() {
*control_flow = ControlFlow::Exit
}
}
_ => (),
}
});
}and resize the window. You should see infinite |
wusyong
approved these changes
Apr 13, 2022
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What kind of change does this PR introduce?
Does this PR introduce a breaking change?
Checklist
fix: remove a typo, closes #___, #___)Other information