miscellaneous fixes for examples

Cargo.lock

···
 
 [[package]]
 name = "soft_ratatui"
-version = "0.0.7"
+version = "0.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc09d84d7266319a84255142563d5c295d887cff6a3d97eac8b359e421c30dc7"
+checksum = "b6f86103b6d0ae58ba8be0939008b32d919ba6f504e7c46a14254dbe33452de8"
 dependencies = [
  "cosmic-text 0.14.2",
  "ratatui",

Cargo.toml

···
 crossterm = "0.29.0"
 ratatui = { version = "0.29.0", features = ["unstable-widget-ref"] }
 smol_str = "0.2.2"
-soft_ratatui = { version = "0.0.7", optional = true }
+soft_ratatui = { version = "0.0.8", optional = true }
 tracing = "0.1.41"
 
 [dev-dependencies]

examples/bevy_keys.rs

···
     prelude::*,
 };
 use bevy_ratatui::{
-    RatatuiPlugins,
-    event::KeyEvent,
-    input_forwarding::{Capability, Detected, Emulate, EmulationPolicy, ReleaseKey},
-    kitty::KittyEnabled,
-    terminal::RatatuiContext,
+    Capability, Detected, Emulate, EmulationPolicy, KeyEvent, KittyEnabled, RatatuiContext,
+    RatatuiPlugins, ReleaseKey,
 };
 use crossterm::event::KeyEventKind;
 use ratatui::text::Text;

examples/demo.rs

···
 
     #[cfg(feature = "windowed")]
     app.add_plugins((
-        DefaultPlugins,
+        DefaultPlugins.set(ImagePlugin::default_nearest()),
         RatatuiPlugins {
             enable_input_forwarding: true,
             ..default()

examples/hello_world.rs

···
-use std::time::Duration;
-
-use bevy::{
-    app::{AppExit, ScheduleRunnerPlugin},
-    prelude::*,
-};
-use bevy_ratatui::{
-    RatatuiPlugins,
-    context::{KeyEvent, RatatuiContext},
-};
+use bevy::{app::AppExit, prelude::*};
+#[cfg(not(feature = "windowed"))]
+use bevy_ratatui::KeyEvent;
+use bevy_ratatui::{RatatuiContext, RatatuiPlugins};
+#[cfg(not(feature = "windowed"))]
 use crossterm::event::KeyCode;
 use ratatui::text::Text;
 
 fn main() {
-    let frame_time = Duration::from_secs_f32(1. / 60.);
-
+    #[cfg(not(feature = "windowed"))]
     App::new()
         .add_plugins((
-            MinimalPlugins.set(ScheduleRunnerPlugin::run_loop(frame_time)),
+            MinimalPlugins.set(bevy::app::ScheduleRunnerPlugin::run_loop(
+                std::time::Duration::from_secs_f32(1. / 60.),
+            )),
             RatatuiPlugins::default(),
         ))
         .add_systems(PreUpdate, input_system)
         .add_systems(Update, draw_system)
         .run();
+    #[cfg(feature = "windowed")]
+    App::new()
+        .add_plugins((
+            DefaultPlugins.set(ImagePlugin::default_nearest()),
+            RatatuiPlugins::default(),
+        ))
+        .add_systems(PreUpdate, input_system_windowed)
+        .add_systems(Update, draw_system)
+        .run();
 }
 
 fn draw_system(mut context: ResMut<RatatuiContext>) -> Result {
···
 
     Ok(())
 }
-
+#[cfg(not(feature = "windowed"))]
 fn input_system(mut events: EventReader<KeyEvent>, mut exit: EventWriter<AppExit>) {
     for event in events.read() {
         if let KeyCode::Char('q') = event.code {
···
         }
     }
 }
+
+#[cfg(feature = "windowed")]
+fn input_system_windowed(keys: Res<ButtonInput<KeyCode>>, mut app_exit: EventWriter<AppExit>) {
+    if keys.just_pressed(KeyCode::KeyQ) {
+        app_exit.write_default();
+    }
+}

examples/kitty.rs

···
     app::{AppExit, ScheduleRunnerPlugin},
     prelude::*,
 };
-use bevy_ratatui::{
-    RatatuiPlugins, event::KeyEvent, kitty::KittyEnabled, terminal::RatatuiContext,
-};
+use bevy_ratatui::{KeyEvent, KittyEnabled, RatatuiContext, RatatuiPlugins};
 use crossterm::event::KeyEventKind;
 use ratatui::text::Text;
 

examples/mouse.rs

···
     app::{AppExit, ScheduleRunnerPlugin},
     prelude::*,
 };
-use bevy_ratatui::{
-    RatatuiPlugins,
-    event::{KeyEvent, MouseEvent},
-    terminal::RatatuiContext,
-};
+use bevy_ratatui::{KeyEvent, MouseEvent, RatatuiContext, RatatuiPlugins};
 use crossterm::event::MouseEventKind;
 use rand::prelude::*;
 

src/crossterm_context/mod.rs

···
 pub mod context;
 mod error;
 pub mod events;
-mod kitty;
+pub mod kitty;
 mod mouse;
 pub mod translation;

src/lib.rs

···
 pub use context_trait::TerminalContext;
 pub use crossterm_context::context::CrosstermContext;
 pub use crossterm_context::events::KeyEvent;
+pub use crossterm_context::events::MouseEvent;
+pub use crossterm_context::kitty::KittyEnabled;
 pub use crossterm_context::translation::*;
 pub use plugins::RatatuiPlugins;
 pub use ratatui_context::RatatuiContext;

src/windowed_context/other.rs

···
         },
         TextureDimension::D2,
         data,
-        TextureFormat::Rgba8Unorm,
+        TextureFormat::Rgba8UnormSrgb,
         RenderAssetUsages::RENDER_WORLD | RenderAssetUsages::MAIN_WORLD,
     );
     let handle = images.add(image);
-    commands.spawn(Sprite::from_image(handle.clone()));
+    commands.spawn((
+        ImageNode::new(handle.clone()),
+        Node {
+            justify_self: JustifySelf::Center,
+            align_self: AlignSelf::Center,
+            ..default()
+        },
+    ));
+
     commands.insert_resource(TerminalRender(handle));
+
     Ok(())
 }
 
···
         },
         TextureDimension::D2,
         data,
-        TextureFormat::Rgba8Unorm,
+        TextureFormat::Rgba8UnormSrgb,
         RenderAssetUsages::RENDER_WORLD | RenderAssetUsages::MAIN_WORLD,
     );
 }