pop
/
monologue-trees
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: pop:6ae7b094ad5cd6219f745375745fcd22138a9e18
Branches Tags
pop:main
..
compare: pop:fc02df86383edb453f0e30fa66cc3daa8e6fc079
Branches Tags
pop:main

No commits in common. '6ae7b094ad5cd6219f745375745fcd22138a9e18' and 'fc02df86383edb453f0e30fa66cc3daa8e6fc079' have entirely different histories.
6ae7b094ad ... fc02df8638

4 changed files with 295 additions and 604 deletions
Show Stats

4
Cargo.toml
Unescape Escape View File

@ -35,10 +35,6 @@ path = "bin/audio-inspect.rs"
name = "editor" name = "editor"
path = "bin/editor.rs" path = "bin/editor.rs"
[[bin]]
name = "chars"
path = "bin/chars.rs"
[dependencies] [dependencies]
bevy = "0.11" bevy = "0.11"

55
bin/chars.rs
Unescape Escape View File

@ -1,55 +0,0 @@
use bevy::input::keyboard::KeyboardInput;
use bevy::input::ButtonState;
use bevy::prelude::*;
fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_systems(Startup, init)
.add_systems(Update, update)
.run();
}
fn init(mut commands: Commands) {
// UI Camera
commands.spawn((
Camera2dBundle { ..default() },
UiCameraConfig { show_ui: true },
));
// Text Box
commands.spawn(TextBundle::from_section(
"Start typing! (Escape to clear)\n",
TextStyle {
color: Color::WHITE,
..default()
},
));
}
fn update(mut query: Query<&mut Text>, mut events: EventReader<KeyboardInput>) {
for KeyboardInput {
key_code,
scan_code,
state,
..
} in events.iter()
{
if *state == ButtonState::Pressed {
let mut text = query.single_mut();
if *key_code == Some(KeyCode::Escape) {
text.sections.drain(1..);
} else {
let style = TextStyle {
color: Color::WHITE,
..default()
};
let added = format!(
"Pressed: KeyCode: {:?} / ScanCode {:?}\n",
key_code, scan_code
);
text.sections.push(TextSection::new(added, style));
}
}
}
}

442
bin/ui-wtf.rs
Unescape Escape View File

@ -18,11 +18,175 @@ fn main() {
)) ))
// .init_resource::<Icon>() // .init_resource::<Icon>()
.add_systems(Startup, init_ui2) .add_systems(Startup, init_ui2)
.add_systems(Update, toggle)
.add_systems(PostUpdate, selection)
// .add_systems(Startup, init_ui) // .add_systems(Startup, init_ui)
// .add_systems(Update, (cursors, container)) // .add_systems(Update, (cursors, container))
.run(); .run();
} }
#[derive(Debug, Bundle)]
struct UiKitContainer {
node_bundle: NodeBundle,
select: Select,
}
#[derive(Copy, Clone)]
enum UiKitPosition {
Top,
Left,
Right,
}
impl UiKitContainer {
fn new(position: UiKitPosition) -> Self {
let style = match position {
UiKitPosition::Top => Style {
border: UiRect::all(Val::Px(1.0)),
top: Val::Percent(102.0),
left: Val::Px(-2.0),
flex_direction: FlexDirection::Column,
align_items: AlignItems::FlexStart,
display: Display::None,
..default()
},
UiKitPosition::Left => Style {
border: UiRect::all(Val::Px(1.0)),
left: Val::Percent(100.0),
top: Val::Px(-2.0),
flex_direction: FlexDirection::Column,
justify_items: JustifyItems::Start,
display: Display::None,
..default()
},
UiKitPosition::Right => Style {
border: UiRect::all(Val::Px(1.0)),
right: Val::Percent(104.0),
top: Val::Px(-2.0),
flex_direction: FlexDirection::Column,
justify_items: JustifyItems::Start,
display: Display::None,
..default()
},
};
UiKitContainer {
node_bundle: NodeBundle {
style,
background_color: BackgroundColor(Color::PURPLE),
border_color: BorderColor(Color::BLACK),
..default()
},
select: Select::None,
}
}
}
#[derive(Debug, Bundle)]
struct UiKitButton {
button_bundle: ButtonBundle,
select: Select,
}
impl UiKitButton {
fn new(color: Color) -> Self {
UiKitButton {
button_bundle: ButtonBundle {
style: Style {
border: UiRect::all(Val::Px(1.0)),
width: Val::Px(100.0),
height: Val::Px(50.0),
flex_direction: FlexDirection::Column,
..default()
},
background_color: BackgroundColor(color),
border_color: BorderColor(Color::BLACK),
..default()
},
select: Select::None,
}
}
}
#[derive(Debug, Component, Copy, Clone)]
enum Select {
Active,
None,
}
/// When an item is selected/de-selected change it's display accordingly
fn selection(
mut events: Query<(&mut BackgroundColor, &Select, &Children), (Changed<Select>, With<Button>)>,
mut styles: Query<&mut Style>,
) {
events
.iter_mut()
.for_each(|(mut bg_color, select, children)| {
bg_color.0 = match select {
Select::Active => Color::RED,
Select::None => Color::WHITE,
};
children.iter().for_each(|&child| {
if let Ok(mut style) = styles.get_mut(child) {
style.display = match select {
Select::Active => Display::Flex,
Select::None => Display::None,
}
}
});
});
}
/// Toggle a UI Nav tree open/closed
///
/// PERF: This is hella not performant, we just usually don't have many elements to iterate over so
/// it's tolerable.
///
// TODO: Should not be able to select multiple children in branch of tree
// TODO: Port to ui.rs
fn toggle(
events: Query<Entity, (Changed<Interaction>, With<Button>)>,
interactions: Query<&Interaction>,
mut selects: Query<&mut Select>,
children: Query<&Children>,
) {
events.iter().for_each(|entity| {
// If all interactions are inactive, set all selections to None
if interactions
.iter()
.all(|&interaction| interaction == Interaction::None)
{
selects.iter_mut().for_each(|mut select| {
*select = Select::None;
});
// Otherwise change this item's selection
} else {
let mut select = selects
.get_mut(entity)
.expect("Entity has Select component");
let interaction = interactions
.get(entity)
.expect("Entity has Interaction component");
*select = match interaction {
Interaction::Pressed | Interaction::Hovered => Select::Active,
Interaction::None => {
let children_inactive = children.iter_descendants(entity).all(|child| {
if let Ok(&c) = interactions.get(child) {
c == Interaction::None
} else {
true
}
});
if children_inactive {
Select::None
} else {
Select::Active
}
}
}
}
});
}
// const CURSORS: [CursorIcon; 35] = [ // const CURSORS: [CursorIcon; 35] = [
// CursorIcon::Default, // CursorIcon::Default,
// CursorIcon::Crosshair, // CursorIcon::Crosshair,
@ -61,147 +225,134 @@ fn main() {
// CursorIcon::RowResize, // CursorIcon::RowResize,
// ]; // ];
fn spawn_tree(parent: &mut ChildBuilder, pos: UiKitPosition, depth: u8, length: u8) { fn spawn_tree(parent: &mut ChildBuilder, pos: UiKitPosition) {
let pos2 = match pos { let pos2 = match pos {
UiKitPosition::Top => UiKitPosition::Left, UiKitPosition::Top => UiKitPosition::Left,
_ => pos, _ => pos,
}; };
(0..length).for_each(|_| { parent
parent .spawn(UiKitButton::new(Color::PINK))
.spawn(UiKitButton::new(Color::PINK)) .with_children(|parent| {
.with_children(|parent| { parent
if depth > 1 { .spawn(UiKitContainer::new(pos))
.with_children(|parent| {
parent parent
.spawn(UiKitContainer::new(pos)) .spawn(UiKitButton::new(Color::PINK))
.with_children(|parent| { .with_children(|parent| {
spawn_tree(parent, pos2, depth - 1, length); parent
.spawn(UiKitContainer::new(pos2))
.with_children(|parent| {
parent.spawn(UiKitButton::new(Color::PINK));
parent.spawn(UiKitButton::new(Color::PINK));
parent.spawn(UiKitButton::new(Color::PINK));
});
}); });
} parent
}); .spawn(UiKitButton::new(Color::PINK))
}); .with_children(|parent| {
// parent parent
// .spawn(UiKitButton::new(Color::PINK)) .spawn(UiKitContainer::new(pos2))
// .with_children(|parent| { .with_children(|parent| {
// parent parent.spawn(UiKitButton::new(Color::PINK));
// .spawn(UiKitContainer::new(pos)) parent.spawn(UiKitButton::new(Color::PINK));
// .with_children(|parent| { parent.spawn(UiKitButton::new(Color::PINK));
// parent });
// .spawn(UiKitButton::new(Color::PINK)) });
// .with_children(|parent| { parent
// parent .spawn(UiKitButton::new(Color::PINK))
// .spawn(UiKitContainer::new(pos2)) .with_children(|parent| {
// .with_children(|parent| { parent
// parent.spawn(UiKitButton::new(Color::PINK)); .spawn(UiKitContainer::new(pos2))
// parent.spawn(UiKitButton::new(Color::PINK)); .with_children(|parent| {
// parent.spawn(UiKitButton::new(Color::PINK)); parent.spawn(UiKitButton::new(Color::PINK));
// }); parent.spawn(UiKitButton::new(Color::PINK));
// }); parent.spawn(UiKitButton::new(Color::PINK));
// parent });
// .spawn(UiKitButton::new(Color::PINK)) });
// .with_children(|parent| { });
// parent });
// .spawn(UiKitContainer::new(pos2)) parent
// .with_children(|parent| { .spawn(UiKitButton::new(Color::PINK))
// parent.spawn(UiKitButton::new(Color::PINK)); .with_children(|parent| {
// parent.spawn(UiKitButton::new(Color::PINK)); parent
// parent.spawn(UiKitButton::new(Color::PINK)); .spawn(UiKitContainer::new(pos))
// }); .with_children(|parent| {
// }); parent
// parent .spawn(UiKitButton::new(Color::PINK))
// .spawn(UiKitButton::new(Color::PINK)) .with_children(|parent| {
// .with_children(|parent| { parent
// parent .spawn(UiKitContainer::new(pos2))
// .spawn(UiKitContainer::new(pos2)) .with_children(|parent| {
// .with_children(|parent| { parent.spawn(UiKitButton::new(Color::PINK));
// parent.spawn(UiKitButton::new(Color::PINK)); parent.spawn(UiKitButton::new(Color::PINK));
// parent.spawn(UiKitButton::new(Color::PINK)); parent.spawn(UiKitButton::new(Color::PINK));
// parent.spawn(UiKitButton::new(Color::PINK)); });
// }); });
// }); parent
// }); .spawn(UiKitButton::new(Color::PINK))
// }); .with_children(|parent| {
// parent parent
// .spawn(UiKitButton::new(Color::PINK)) .spawn(UiKitContainer::new(pos2))
// .with_children(|parent| { .with_children(|parent| {
// parent parent.spawn(UiKitButton::new(Color::PINK));
// .spawn(UiKitContainer::new(pos)) parent.spawn(UiKitButton::new(Color::PINK));
// .with_children(|parent| { parent.spawn(UiKitButton::new(Color::PINK));
// parent });
// .spawn(UiKitButton::new(Color::PINK)) });
// .with_children(|parent| { parent
// parent .spawn(UiKitButton::new(Color::PINK))
// .spawn(UiKitContainer::new(pos2)) .with_children(|parent| {
// .with_children(|parent| { parent
// parent.spawn(UiKitButton::new(Color::PINK)); .spawn(UiKitContainer::new(pos2))
// parent.spawn(UiKitButton::new(Color::PINK)); .with_children(|parent| {
// parent.spawn(UiKitButton::new(Color::PINK)); parent.spawn(UiKitButton::new(Color::PINK));
// }); parent.spawn(UiKitButton::new(Color::PINK));
// }); parent.spawn(UiKitButton::new(Color::PINK));
// parent });
// .spawn(UiKitButton::new(Color::PINK)) });
// .with_children(|parent| { });
// parent });
// .spawn(UiKitContainer::new(pos2)) parent
// .with_children(|parent| { .spawn(UiKitButton::new(Color::PINK))
// parent.spawn(UiKitButton::new(Color::PINK)); .with_children(|parent| {
// parent.spawn(UiKitButton::new(Color::PINK)); parent
// parent.spawn(UiKitButton::new(Color::PINK)); .spawn(UiKitContainer::new(pos))
// }); .with_children(|parent| {
// }); parent
// parent .spawn(UiKitButton::new(Color::PINK))
// .spawn(UiKitButton::new(Color::PINK)) .with_children(|parent| {
// .with_children(|parent| { parent
// parent .spawn(UiKitContainer::new(pos2))
// .spawn(UiKitContainer::new(pos2)) .with_children(|parent| {
// .with_children(|parent| { parent.spawn(UiKitButton::new(Color::PINK));
// parent.spawn(UiKitButton::new(Color::PINK)); parent.spawn(UiKitButton::new(Color::PINK));
// parent.spawn(UiKitButton::new(Color::PINK)); parent.spawn(UiKitButton::new(Color::PINK));
// parent.spawn(UiKitButton::new(Color::PINK)); });
// }); });
// }); parent
// }); .spawn(UiKitButton::new(Color::PINK))
// }); .with_children(|parent| {
// parent parent
// .spawn(UiKitButton::new(Color::PINK)) .spawn(UiKitContainer::new(pos2))
// .with_children(|parent| { .with_children(|parent| {
// parent parent.spawn(UiKitButton::new(Color::PINK));
// .spawn(UiKitContainer::new(pos)) parent.spawn(UiKitButton::new(Color::PINK));
// .with_children(|parent| { parent.spawn(UiKitButton::new(Color::PINK));
// parent });
// .spawn(UiKitButton::new(Color::PINK)) });
// .with_children(|parent| { parent
// parent .spawn(UiKitButton::new(Color::PINK))
// .spawn(UiKitContainer::new(pos2)) .with_children(|parent| {
// .with_children(|parent| { parent
// parent.spawn(UiKitButton::new(Color::PINK)); .spawn(UiKitContainer::new(pos2))
// parent.spawn(UiKitButton::new(Color::PINK)); .with_children(|parent| {
// parent.spawn(UiKitButton::new(Color::PINK)); parent.spawn(UiKitButton::new(Color::PINK));
// }); parent.spawn(UiKitButton::new(Color::PINK));
// }); parent.spawn(UiKitButton::new(Color::PINK));
// parent });
// .spawn(UiKitButton::new(Color::PINK)) });
// .with_children(|parent| { });
// parent });
// .spawn(UiKitContainer::new(pos2))
// .with_children(|parent| {
// parent.spawn(UiKitButton::new(Color::PINK));
// parent.spawn(UiKitButton::new(Color::PINK));
// parent.spawn(UiKitButton::new(Color::PINK));
// });
// });
// parent
// .spawn(UiKitButton::new(Color::PINK))
// .with_children(|parent| {
// parent
// .spawn(UiKitContainer::new(pos2))
// .with_children(|parent| {
// parent.spawn(UiKitButton::new(Color::PINK));
// parent.spawn(UiKitButton::new(Color::PINK));
// parent.spawn(UiKitButton::new(Color::PINK));
// });
// });
// });
// });
} }
fn init_ui2(mut commands: Commands) { fn init_ui2(mut commands: Commands) {
@ -222,23 +373,6 @@ fn init_ui2(mut commands: Commands) {
..default() ..default()
}) })
.with_children(|parent| { .with_children(|parent| {
parent
.spawn(ButtonBundle {
style: Style {
border: UiRect::all(Val::Px(1.0)),
width: Val::Px(200.0),
height: Val::Px(150.0),
align_self: AlignSelf::Center,
..default()
},
background_color: BackgroundColor(Color::WHITE),
border_color: BorderColor(Color::BLACK),
..default()
})
.with_children(|parent| {
parent.spawn(UiKitTextInput::new());
});
parent parent
.spawn(NodeBundle { .spawn(NodeBundle {
style: Style { style: Style {
@ -254,7 +388,7 @@ fn init_ui2(mut commands: Commands) {
..default() ..default()
}) })
.with_children(|parent| { .with_children(|parent| {
spawn_tree(parent, UiKitPosition::Left, 3, 7); spawn_tree(parent, UiKitPosition::Left);
}); });
parent parent
@ -272,7 +406,7 @@ fn init_ui2(mut commands: Commands) {
..default() ..default()
}) })
.with_children(|parent| { .with_children(|parent| {
spawn_tree(parent, UiKitPosition::Right, 3, 7); spawn_tree(parent, UiKitPosition::Right);
}); });
parent parent
@ -289,7 +423,7 @@ fn init_ui2(mut commands: Commands) {
..default() ..default()
}) })
.with_children(|parent| { .with_children(|parent| {
spawn_tree(parent, UiKitPosition::Top, 3, 7); spawn_tree(parent, UiKitPosition::Top);
}); });
}); });
} }

398
src/ui.rs
Unescape Escape View File

@ -1,399 +1,15 @@
/// TODO: /// TODO:
/// * Text box w/ clear button /// * Titles on top left of window/tab
/// * Names/Labels management /// *
/// * Button color management use bevy::{prelude::*, window::PrimaryWindow};
/// * Move code to submodules
///
/// BUGS:
/// * When selecting one tree, possible to select another without the first closing.
///
use bevy::{
input::{
keyboard::KeyboardInput,
mouse::{MouseScrollUnit, MouseWheel},
ButtonState,
},
prelude::*,
window::PrimaryWindow,
};
pub struct GameUiPlugin; pub struct GameUiPlugin;
impl Plugin for GameUiPlugin { impl Plugin for GameUiPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_systems(Update, (select_tab, select_textbox, text_editor, scroll)) app;
.add_systems(PostUpdate, selection); // .add_systems(PreUpdate, )
// .add_systems(Update,)
// .add_systems(PostUpdate, );
} }
} }
#[derive(Debug, Bundle)]
pub struct UiKitContainer {
node_bundle: NodeBundle,
select: UiKitSelect,
}
#[derive(Copy, Clone)]
pub enum UiKitPosition {
Top,
Left,
Right,
}
impl UiKitContainer {
pub fn new(position: UiKitPosition) -> Self {
let style = match position {
UiKitPosition::Top => Style {
border: UiRect::all(Val::Px(1.0)),
top: Val::Percent(102.0),
left: Val::Px(-2.0),
flex_direction: FlexDirection::Column,
align_items: AlignItems::FlexStart,
display: Display::None,
..default()
},
UiKitPosition::Left => Style {
border: UiRect::all(Val::Px(1.0)),
left: Val::Percent(100.0),
top: Val::Px(-2.0),
flex_direction: FlexDirection::Column,
justify_items: JustifyItems::Start,
display: Display::None,
..default()
},
UiKitPosition::Right => Style {
border: UiRect::all(Val::Px(1.0)),
right: Val::Percent(104.0),
top: Val::Px(-2.0),
flex_direction: FlexDirection::Column,
justify_items: JustifyItems::Start,
display: Display::None,
..default()
},
};
UiKitContainer {
node_bundle: NodeBundle {
style,
background_color: BackgroundColor(Color::PURPLE),
border_color: BorderColor(Color::BLACK),
..default()
},
select: UiKitSelect::None,
}
}
}
#[derive(Debug, Bundle)]
pub struct UiKitButton {
button_bundle: ButtonBundle,
select: UiKitSelect,
}
impl UiKitButton {
pub fn new(color: Color) -> Self {
UiKitButton {
button_bundle: ButtonBundle {
style: Style {
border: UiRect::all(Val::Px(1.0)),
width: Val::Px(100.0),
height: Val::Px(50.0),
flex_direction: FlexDirection::Column,
..default()
},
background_color: BackgroundColor(color),
border_color: BorderColor(Color::BLACK),
..default()
},
select: UiKitSelect::None,
}
}
}
#[derive(Debug, Component, Copy, Clone, PartialEq)]
pub enum UiKitSelect {
Active,
None,
}
#[derive(Debug, Bundle)]
pub struct UiKitTextInput {
text_bundle: TextBundle,
interaction: Interaction,
select: UiKitSelect,
}
impl UiKitTextInput {
pub fn new() -> Self {
UiKitTextInput {
text_bundle: TextBundle {
style: Style {
width: Val::Percent(100.0),
height: Val::Percent(100.0),
..default()
},
..default()
},
interaction: Interaction::None,
select: UiKitSelect::None,
}
}
}
/// When an item is selected/de-selected change it's display accordingly
fn selection(
mut events: Query<
(&mut BackgroundColor, &UiKitSelect, &Children),
(Changed<UiKitSelect>, With<Button>),
>,
mut styles: Query<&mut Style>,
) {
events
.iter_mut()
.for_each(|(mut bg_color, select, children)| {
bg_color.0 = match select {
UiKitSelect::Active => Color::RED,
UiKitSelect::None => Color::WHITE,
};
children.iter().for_each(|&child| {
if let Ok(mut style) = styles.get_mut(child) {
style.display = match select {
UiKitSelect::Active => Display::Flex,
UiKitSelect::None => Display::None,
}
}
});
});
}
/// Toggle a UI Nav tree open/closed
///
/// PERF: This is hella not performant, we just usually don't have many elements to iterate over so
/// it's tolerable.
///
// TODO: Should not be able to select multiple children in branch of tree
// TODO: Port to ui.rs
fn select_tab(
events: Query<Entity, (Changed<Interaction>, With<Button>)>,
interactions: Query<&Interaction, With<Button>>,
mut selects: Query<&mut UiKitSelect>,
parents: Query<&Parent>,
children: Query<&Children>,
) {
events.iter().for_each(|entity| {
// Otherwise, update nav tree(s)
if let Ok(interaction) = interactions.get(entity) {
match interaction {
Interaction::Pressed | Interaction::Hovered => {
{
let parent = parents.get(entity).expect("entity has parent");
children
.get(parent.get())
.expect("parent has children")
.iter()
.filter(|&e| *e != entity)
.for_each(|sibling| {
if let Ok(mut select) = selects.get_mut(*sibling) {
*select = UiKitSelect::None
}
});
}
if let Ok(mut select) = selects.get_mut(entity) {
*select = UiKitSelect::Active
}
}
Interaction::None => {
// Find the ancestor which does not have a parent
let root_parent = parents
.iter_ancestors(entity)
.find(|&e| parents.get(e).is_err())
.expect("entity has root parent");
let family: Vec<Entity> = children.iter_descendants(root_parent).collect();
let family_inactive = family
.iter()
.filter_map(|member| interactions.get(*member).ok())
.all(|&interaction| interaction == Interaction::None);
// Zero out children
let descendants: Vec<Entity> = children.iter_descendants(entity).collect();
let descendants_inactive = descendants
.iter()
.filter_map(|child| interactions.get(*child).ok())
.all(|&interaction| interaction == Interaction::None);
// The entire tree is inactive
if family_inactive {
family.iter().for_each(|member| {
if let Ok(mut select) = selects.get_mut(*member) {
*select = UiKitSelect::None
}
});
if let Ok(mut select) = selects.get_mut(entity) {
*select = UiKitSelect::None
}
// Just the sub-tree is inactive
} else if descendants_inactive {
descendants.iter().for_each(|child| {
if let Ok(mut select) = selects.get_mut(*child) {
*select = UiKitSelect::None
}
});
if let Ok(mut select) = selects.get_mut(entity) {
*select = UiKitSelect::None
}
// This node is active (usually a parent of an active child)
} else if let Ok(mut select) = selects.get_mut(entity) {
*select = UiKitSelect::Active
}
}
}
}
});
}
fn select_textbox(
mut events: Query<(&Interaction, &mut UiKitSelect), (With<Text>, Changed<Interaction>)>,
) {
events.iter_mut().for_each(|(interaction, mut select)| {
*select = match interaction {
Interaction::Pressed => UiKitSelect::Active,
Interaction::Hovered => UiKitSelect::Active,
Interaction::None => UiKitSelect::None,
}
});
}
fn text_editor(
keyboard: Res<Input<KeyCode>>,
mut events: EventReader<KeyboardInput>,
mut query: Query<&mut Text, With<UiKitSelect>>,
) {
events.iter().for_each(
|KeyboardInput {
key_code,
state,
scan_code,
..
}| {
match state {
ButtonState::Pressed => {
if let Some(kc) = key_code {
query.iter_mut().for_each(|mut text| {
use KeyCode::*;
let style = TextStyle {
color: Color::BLACK,
..default()
};
if *kc == Back {
text.sections.pop();
} else {
let c = match kc {
// Letters
A | B | C | D | E | F | G | H | I | J | K | L | M | N | O
| P | Q | R | S | T | U | V | W | X | Y | Z => {
if keyboard.any_pressed([ShiftLeft, ShiftRight]) {
format!("{:?}", kc).to_uppercase()
} else {
format!("{:?}", kc).to_lowercase()
}
}
// Top Row
Grave => "`".to_string(),
Key1 | Numpad1 => "1".to_string(),
Key2 | Numpad2 => "2".to_string(),
Key3 | Numpad3 => "3".to_string(),
Key4 | Numpad4 => "4".to_string(),
Key5 | Numpad5 => "5".to_string(),
Key6 | Numpad6 => "6".to_string(),
Key7 | Numpad7 => "7".to_string(),
Key8 | Numpad8 => "8".to_string(),
Key9 | Numpad9 => "9".to_string(),
Key0 | Numpad0 => "0".to_string(),
Minus => "-".to_string(),
Equals => "=".to_string(),
// Left side
Tab => "\t".to_string(),
// Right side
// Row 2
BracketLeft => "[".to_string(),
BracketRight => "]".to_string(),
Backslash => "\\".to_string(),
// Row 3
Semicolon => ";".to_string(),
Apostrophe => "'".to_string(),
Return => "\n".to_string(),
// Row 4
Comma => ",".to_string(),
Period => ".".to_string(),
Slash => "/".to_string(),
// Space
Space => " ".to_string(),
// None
_ => "".to_string(),
};
if c.len() > 0 {
text.sections.push(TextSection::new(c, style));
}
}
});
}
}
_ => (),
}
},
)
}
// TODO: Reset default position when de-activated
fn scroll(
mut scrolls: EventReader<MouseWheel>,
mut query: Query<(&mut Style, &UiKitSelect, Entity, &Children, &Parent)>,
changes: Query<Entity, Changed<UiKitSelect>>,
) {
// Brute force: When all Actives are set to None (event) reset all style tops...
changes.iter().for_each(|_| {
let all_inactive = query
.iter_mut()
.all(|(_, select, _, _, _)| *select == UiKitSelect::None);
all_inactive.then(|| {
query
.iter_mut()
.for_each(|(mut style, _, _, _, _)| style.top = Val::Px(0.0));
});
});
scrolls.iter().for_each(|MouseWheel { unit, y, .. }| {
// Find the leaf selected entity
let leaf = query
.iter()
.find(|(_, select, _, children, parent)| {
// This node is active
let self_active = **select == UiKitSelect::Active;
// All children are not selected
let children_inactive = children.iter().all(|&child| {
if let Ok((_, select, _, _, _)) = query.get(child) {
*select == UiKitSelect::None
} else {
true
}
});
// Both must be true
self_active && children_inactive
})
.map(|(_, _, _, _, parent)| parent.get());
if let Some(l) = leaf {
if let Ok((mut style, _, _, _, _)) = query.get_mut(l) {
if *y != 0.0 {
let delta = match unit {
MouseScrollUnit::Line => *y,
MouseScrollUnit::Pixel => 5.0,
};
style.top.try_sub_assign(Val::Px(delta));
info!("Top: {:?}", style.top);
}
}
};
});
}

Write Preview
Loading…
Cancel
Save