Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Close inventory when pressing e #328

Merged
merged 1 commit into from
Mar 10, 2024
Merged

Close inventory when pressing e #328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/render/inventory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::render::hud::Hud;
use crate::render::Renderer;
use crate::screen::{Screen, ScreenSystem};
use crate::ui::{Container, ImageRef, TextBoxRef, TextRef, VAttach};
use crate::{ui, Game};
use crate::{ui, Game, KeyCmp};
use parking_lot::RwLock;
use std::sync::Arc;
use winit::keyboard::{Key, NamedKey, PhysicalKey};
Expand All @@ -16,6 +16,7 @@ pub struct InventoryWindow {
pub text_box: Vec<TextBoxRef>,
pub inventory: Arc<RwLock<dyn Inventory + Sync + Send>>,
pub inventory_context: Arc<RwLock<InventoryContext>>,
initial_release: bool,
}

impl Screen for InventoryWindow {
Expand Down Expand Up @@ -98,7 +99,12 @@ impl Screen for InventoryWindow {
}

fn on_key_press(&mut self, key: (Key, PhysicalKey), down: bool, game: &mut Game) {
if key.0 == Key::Named(NamedKey::Escape) && !down {
let is_e = key.0.eq_ignore_case('e');
if is_e && !down && !self.initial_release {
self.initial_release = true;
return;
}
if (key.0 == Key::Named(NamedKey::Escape) || is_e) && !down {
self.inventory_context
.write()
.try_close_inventory(&game.screen_sys);
Expand Down Expand Up @@ -126,6 +132,7 @@ impl InventoryWindow {
inventory_context,
cursor_element: vec![],
text_box: vec![],
initial_release: false,
}
}
}
Expand Down
Loading