Tim-Paik/neutauri
1
0
Fork 0
mirror of https://github.com/Tim-Paik/neutauri.git synced 2024-10-12 23:29:41 +00:00
Code Issues Releases Activity

runner with window size

Browse Source
This commit is contained in:
Tim-Paik
2022-01-30 13:04:26 +08:00
parent 1a94a55cf1
commit 6a9dbb4a19
2 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
neutauri_runtime/src/main.rs
+39 -30
View File
@@ -1,7 +1,8 @@
use wry::{
application::{
event::{Event, StartCause, WindowEvent},
event_loop::{self, ControlFlow, EventLoop},
dpi::{PhysicalSize, Size},
event::{Event, WindowEvent},
event_loop::{ControlFlow, EventLoop},
window::{Fullscreen, Icon, Window, WindowBuilder},
},
webview::{RpcRequest, WebViewBuilder},
@@ -59,41 +60,25 @@ fn main() -> wry::Result<()> {
)?)),
None => window_builder,
};
let monitor = event_loop
let monitor_size = event_loop
.primary_monitor()
.unwrap_or_else(|| event_loop.available_monitors().next().unwrap());
dbg!(
monitor.size(),
monitor.name(),
monitor.position(),
monitor.scale_factor(),
monitor.video_modes().collect::<Vec<_>>()
);
.unwrap_or_else(|| {
event_loop
.available_monitors()
.next()
.expect("no monitor found")
})
.size();
let window_builder = match res.window_attr.inner_size {
Some(size) => match size {
data::WindowSize::Large => todo!(),
data::WindowSize::Medium => todo!(),
data::WindowSize::Small => todo!(),
data::WindowSize::Fixed(width, height) => todo!(),
},
Some(size) => window_builder.with_inner_size(get_size(size, monitor_size)),
None => window_builder,
};
let window_builder = match res.window_attr.max_inner_size {
Some(size) => match size {
data::WindowSize::Large => todo!(),
data::WindowSize::Medium => todo!(),
data::WindowSize::Small => todo!(),
data::WindowSize::Fixed(width, height) => todo!(),
},
Some(size) => window_builder.with_max_inner_size(get_size(size, monitor_size)),
None => window_builder,
};
let window_builder = match res.window_attr.min_inner_size {
Some(size) => match size {
data::WindowSize::Large => todo!(),
data::WindowSize::Medium => todo!(),
data::WindowSize::Small => todo!(),
data::WindowSize::Fixed(width, height) => todo!(),
},
Some(size) => window_builder.with_min_inner_size(get_size(size, monitor_size)),
None => window_builder,
};
let window = window_builder.build(&event_loop)?;
@@ -102,7 +87,7 @@ fn main() -> wry::Result<()> {
let url = res.webview_attr.url.clone();
let webview_builder = match url {
Some(url) => {
if url.starts_with("/") {
if url.starts_with('/') {
webview_builder.with_url(&custom_protocol_uri(PROTOCOL, &url))?
} else {
webview_builder.with_url(&url)?
@@ -161,6 +146,7 @@ fn main() -> wry::Result<()> {
*control_flow = ControlFlow::Wait;
match event {
Event::UserEvent(event) => println!("user event: {:#?}", event),
Event::WindowEvent {
event: WindowEvent::CloseRequested,
..
@@ -169,3 +155,26 @@ fn main() -> wry::Result<()> {
}
});
}
fn get_size(size: data::WindowSize, monitor_size: PhysicalSize<u32>) -> Size {
let (width, height) = match size {
data::WindowSize::Large => (
monitor_size.width as f64 * 0.7,
monitor_size.height as f64 * 0.7,
),
data::WindowSize::Medium => (
monitor_size.width as f64 * 0.6,
monitor_size.height as f64 * 0.6,
),
data::WindowSize::Small => (
monitor_size.width as f64 * 0.5,
monitor_size.height as f64 * 0.5,
),
data::WindowSize::Fixed { width, height } => (width, height),
data::WindowSize::Scale { factor } => (
monitor_size.width as f64 * factor,
monitor_size.height as f64 * factor,
),
};
Size::Physical(PhysicalSize::new(width as u32, height as u32))
}