phantop
/
doukutsu-rs
mirror of https://github.com/doukutsu-rs/doukutsu-rs
1
0
Fork 0
Code Issues Releases Wiki Activity

fix menu selection snapping on first tick (#77)

This commit is contained in:
József Sallai 2022-03-06 18:00:50 +02:00 committed by GitHub
parent bc56271174
commit 05b9d9ebe0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/menu/mod.rs
View File

@ -73,7 +73,6 @@ pub struct Menu {
pub height: u16,
pub selected: usize,
pub entries: Vec<MenuEntry>,
entry_y: u16,
anim_num: u16,
anim_wait: u16,
custom_cursor: Cell<bool>,
@ -87,7 +86,6 @@ impl Menu {
width,
height,
selected: 0,
entry_y: 0,
anim_num: 0,
anim_wait: 0,
entries: Vec::new(),
@ -204,6 +202,12 @@ impl Menu {
batch.draw(ctx)?;
let mut entry_y = 0;
if !self.entries.is_empty() {
entry_y = self.entries[0..(self.selected)].iter().map(|e| e.height()).sum::<f64>().max(0.0) as u16;
}
if self.custom_cursor.get() {
if let Ok(batch) = state.texture_set.get_or_load_batch(ctx, &state.constants, "MenuCursor") {
rect.left = self.anim_num * 16;
@ -211,7 +215,7 @@ impl Menu {
rect.right = rect.left + 16;
rect.bottom = rect.top + 16;
batch.add_rect(self.x as f32, self.y as f32 + 3.0 + self.entry_y as f32, &rect);
batch.add_rect(self.x as f32, self.y as f32 + 3.0 + entry_y as f32, &rect);
batch.draw(ctx)?;
} else {
@ -250,7 +254,7 @@ impl Menu {
batch.add_rect(
self.x as f32,
self.y as f32 + 4.0 + self.entry_y as f32,
self.y as f32 + 4.0 + entry_y as f32,
&character_rect[self.anim_num as usize],
);
@ -528,10 +532,6 @@ impl Menu {
}
}
if !self.entries.is_empty() {
self.entry_y = self.entries[0..(self.selected)].iter().map(|e| e.height()).sum::<f64>().max(0.0) as u16;
}
let mut y = self.y as f32 + 8.0;
for (idx, entry) in self.entries.iter_mut().enumerate() {
let entry_bounds = Rect::new_size(self.x, y as isize, self.width as isize, entry.height() as isize);