Merge branch 'master' into add-file-data-drag-event

This commit is contained in:
Jonathan Kelley authored and GitHub committed 2024-01-08 13:34:24 -08:00
commit 5ccbeeab46
49 files changed
+1188 -888

No files matched your search

+2 -2
View File
@@ -87,7 +87,7 @@ impl<P: 'static> App<P> {
crate::collect_assets::copy_assets();
// Set the event converter
dioxus_html::set_event_converter(Box::new(SerializedHtmlEventConverter));
dioxus_html::set_event_converter(Box::new(crate::events::SerializedHtmlEventConverter));
// Allow hotreloading to work - but only in debug mode
#[cfg(all(feature = "hot-reload", debug_assertions))]
@@ -248,7 +248,7 @@ impl<P: 'static> App<P> {
let as_any = match data {
dioxus_html::EventData::Mounted => {
let element = DesktopElement::new(element, view.desktop_context.clone(), query);
Rc::new(PlatformEventData::new(Box::new(MountedData::new(element))))
Rc::new(PlatformEventData::new(Box::new(element)))
}
_ => data.into_any(),
};
+6 -1
View File
@@ -47,7 +47,12 @@ impl Config {
/// Initializes a new `WindowBuilder` with default values.
#[inline]
pub fn new() -> Self {
let window = WindowBuilder::new().with_title("Dioxus app");
let window = WindowBuilder::new().with_title(
dioxus_cli_config::CURRENT_CONFIG
.as_ref()
.map(|c| c.dioxus_config.application.name.clone())
.unwrap_or("Dioxus App".to_string()),
);
Self {
// event_handler: None,