Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Skip setting default window size on mobile #129

Merged
merged 2 commits into from
Sep 6, 2024
Merged

Skip setting default window size on mobile #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f4f46d
Skip setting default window size on mobile
matthunz Sep 6, 2024
b0ef80d
Fix default height
matthunz Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions packages/dioxus-blitz/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ mod accessibility;
use blitz_dom::{DocumentLike, HtmlDocument};
use dioxus::prelude::{ComponentFunction, Element, VirtualDom};
use url::Url;
use winit::event_loop::{ControlFlow, EventLoop};
use winit::{
dpi::LogicalSize,
event_loop::{ControlFlow, EventLoop},
window::Window,
};

use crate::application::Application;
use crate::window::View;
Expand Down Expand Up @@ -62,9 +66,8 @@ pub fn launch_cfg_with_props<P: Clone + 'static, M: 'static>(
// We're going to need to hit it with a special waker
let vdom = VirtualDom::new_with_props(root, props);
let document = DioxusDocument::new(vdom);
let window = WindowConfig::new(document, 800.0, 600.0);

launch_with_window(window)
launch_with_document(document)
}

pub fn launch_url(url: &str) {
Expand Down Expand Up @@ -97,7 +100,22 @@ pub fn launch_static_html(html: &str) {

pub fn launch_static_html_cfg(html: &str, cfg: Config) {
let document = HtmlDocument::from_html(html, cfg.base_url, cfg.stylesheets);
let window = WindowConfig::new(document, 800.0, 600.0);
launch_with_document(document)
}

fn launch_with_document(doc: impl DocumentLike) {
let mut window_attrs = Window::default_attributes();
if !cfg!(all(target_os = "android", target_os = "ios")) {
window_attrs.inner_size = Some(
LogicalSize {
width: 800.,
height: 600.,
}
.into(),
);
}
let window = WindowConfig::new(doc);

launch_with_window(window)
}

Expand Down
5 changes: 2 additions & 3 deletions packages/dioxus-blitz/src/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ use wgpu::rwh::HasWindowHandle;

use std::sync::Arc;
use std::task::Waker;
use winit::dpi::LogicalSize;
use winit::event::{ElementState, MouseButton};
use winit::event_loop::{ActiveEventLoop, EventLoopProxy};
use winit::window::{WindowAttributes, WindowId};
Expand All @@ -26,10 +25,10 @@ pub struct WindowConfig<Doc: DocumentLike> {
}

impl<Doc: DocumentLike> WindowConfig<Doc> {
pub fn new(doc: Doc, width: f32, height: f32) -> Self {
pub fn new(doc: Doc) -> Self {
WindowConfig {
doc,
attributes: Window::default_attributes().with_inner_size(LogicalSize { width, height }),
attributes: Window::default_attributes(),
}
}

Expand Down