From ef0ff43a65b729eacb629a453b614445233778bd Mon Sep 17 00:00:00 2001
From: MrGVSV <gino.valente.code@gmail.com>
Date: Tue, 18 Jan 2022 14:19:13 -0800
Subject: [PATCH] Fixed compile errors
---
examples/tabs/tabs.rs | 2 +-
kayak_core/src/event_dispatcher.rs | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/examples/tabs/tabs.rs b/examples/tabs/tabs.rs
index bf3b892..9b199a9 100644
--- a/examples/tabs/tabs.rs
+++ b/examples/tabs/tabs.rs
@@ -96,7 +96,7 @@ fn startup(
) {
commands.spawn_bundle(UICameraBundle::new());
- font_mapping.add(asset_server.load("roboto.kayak_font"));
+ font_mapping.add("Roboto", asset_server.load("roboto.kayak_font"));
let theme = TabTheme {
primary: Default::default(),
diff --git a/kayak_core/src/event_dispatcher.rs b/kayak_core/src/event_dispatcher.rs
index 4d10a67..5fd69cd 100644
--- a/kayak_core/src/event_dispatcher.rs
+++ b/kayak_core/src/event_dispatcher.rs
@@ -48,7 +48,6 @@ impl EventDispatcher {
Self {
last_clicked: Binding::new(Index::default()),
is_mouse_pressed: Default::default(),
- current_focus: Default::default(),
current_mouse_position: Default::default(),
next_mouse_position: Default::default(),
previous_events: Default::default(),
@@ -151,7 +150,7 @@ impl EventDispatcher {
fn build_event_stream(
&mut self,
input_events: &[InputEvent],
- widget_manager: &WidgetManager,
+ widget_manager: &mut WidgetManager,
) -> Vec<Event> {
let mut event_stream = Vec::<Event>::new();
let mut states: HashMap<EventType, EventState> = HashMap::new();
@@ -328,7 +327,7 @@ impl EventDispatcher {
&mut self,
input_event: &InputEvent,
_states: &mut HashMap<EventType, EventState>,
- _widget_manager: &WidgetManager,
+ widget_manager: &WidgetManager,
) -> Vec<Event> {
let mut event_stream = Vec::new();
if let Some(current_focus) = widget_manager.focus_tree.current() {
--
GitLab