Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kayak UI
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Microhacks
Bevy Forks
Kayak UI
Commits
ef0ff43a
Commit
ef0ff43a
authored
3 years ago
by
MrGVSV
Browse files
Options
Downloads
Patches
Plain Diff
Fixed compile errors
parent
d185f2cd
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
examples/tabs/tabs.rs
+1
-1
1 addition, 1 deletion
examples/tabs/tabs.rs
kayak_core/src/event_dispatcher.rs
+2
-3
2 additions, 3 deletions
kayak_core/src/event_dispatcher.rs
with
3 additions
and
4 deletions
examples/tabs/tabs.rs
+
1
−
1
View file @
ef0ff43a
...
@@ -96,7 +96,7 @@ fn startup(
...
@@ -96,7 +96,7 @@ fn startup(
)
{
)
{
commands
.spawn_bundle
(
UICameraBundle
::
new
());
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
{
let
theme
=
TabTheme
{
primary
:
Default
::
default
(),
primary
:
Default
::
default
(),
...
...
This diff is collapsed.
Click to expand it.
kayak_core/src/event_dispatcher.rs
+
2
−
3
View file @
ef0ff43a
...
@@ -48,7 +48,6 @@ impl EventDispatcher {
...
@@ -48,7 +48,6 @@ impl EventDispatcher {
Self
{
Self
{
last_clicked
:
Binding
::
new
(
Index
::
default
()),
last_clicked
:
Binding
::
new
(
Index
::
default
()),
is_mouse_pressed
:
Default
::
default
(),
is_mouse_pressed
:
Default
::
default
(),
current_focus
:
Default
::
default
(),
current_mouse_position
:
Default
::
default
(),
current_mouse_position
:
Default
::
default
(),
next_mouse_position
:
Default
::
default
(),
next_mouse_position
:
Default
::
default
(),
previous_events
:
Default
::
default
(),
previous_events
:
Default
::
default
(),
...
@@ -151,7 +150,7 @@ impl EventDispatcher {
...
@@ -151,7 +150,7 @@ impl EventDispatcher {
fn
build_event_stream
(
fn
build_event_stream
(
&
mut
self
,
&
mut
self
,
input_events
:
&
[
InputEvent
],
input_events
:
&
[
InputEvent
],
widget_manager
:
&
WidgetManager
,
widget_manager
:
&
mut
WidgetManager
,
)
->
Vec
<
Event
>
{
)
->
Vec
<
Event
>
{
let
mut
event_stream
=
Vec
::
<
Event
>
::
new
();
let
mut
event_stream
=
Vec
::
<
Event
>
::
new
();
let
mut
states
:
HashMap
<
EventType
,
EventState
>
=
HashMap
::
new
();
let
mut
states
:
HashMap
<
EventType
,
EventState
>
=
HashMap
::
new
();
...
@@ -328,7 +327,7 @@ impl EventDispatcher {
...
@@ -328,7 +327,7 @@ impl EventDispatcher {
&
mut
self
,
&
mut
self
,
input_event
:
&
InputEvent
,
input_event
:
&
InputEvent
,
_states
:
&
mut
HashMap
<
EventType
,
EventState
>
,
_states
:
&
mut
HashMap
<
EventType
,
EventState
>
,
_
widget_manager
:
&
WidgetManager
,
widget_manager
:
&
WidgetManager
,
)
->
Vec
<
Event
>
{
)
->
Vec
<
Event
>
{
let
mut
event_stream
=
Vec
::
new
();
let
mut
event_stream
=
Vec
::
new
();
if
let
Some
(
current_focus
)
=
widget_manager
.focus_tree
.current
()
{
if
let
Some
(
current_focus
)
=
widget_manager
.focus_tree
.current
()
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment