phantop/doukutsu-rs
1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2024-11-16 10:52:44 +00:00
Code Issues Releases Wiki Activity

Consistent menu spacing

Browse source
This commit is contained in:
Alula 2022-01-22 05:08:13 +01:00
parent dcd33d943e
commit dba6789b0a
No known key found for this signature in database
GPG key ID: 3E00485503A1D8BA
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/menu/mod.rs
View file

@ -103,7 +103,7 @@ impl Menu {
height += entry.height(); height += entry.height();
} }
self.height = height.max(8.0) as u16; self.height = height.max(16.0) as u16;
} }
pub fn draw(&self, state: &mut SharedGameState, ctx: &mut Context) -> GameResult { pub fn draw(&self, state: &mut SharedGameState, ctx: &mut Context) -> GameResult {
@ -223,7 +223,7 @@ impl Menu {
rect.right = rect.left + 16; rect.right = rect.left + 16;
rect.bottom = rect.top + 16; rect.bottom = rect.top + 16;
batch.add_rect(self.x as f32, self.y as f32 + 2.0 + self.entry_y as f32, &rect); batch.add_rect(self.x as f32, self.y as f32 + 4.0 + self.entry_y as f32, &rect);
batch.draw(ctx)?; batch.draw(ctx)?;
} }
@ -235,7 +235,7 @@ impl Menu {
state.font.draw_text( state.font.draw_text(
name.chars(), name.chars(),
self.x as f32 + 20.0, self.x as f32 + 20.0,
y - 2.0, y,
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
ctx, ctx,
@ -245,7 +245,7 @@ impl Menu {
state.font.draw_colored_text( state.font.draw_colored_text(
name.chars(), name.chars(),
self.x as f32 + 20.0, self.x as f32 + 20.0,
y - 2.0, y,
(0xa0, 0xa0, 0xff, 0xff), (0xa0, 0xa0, 0xff, 0xff),
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
@ -259,7 +259,7 @@ impl Menu {
state.font.draw_text( state.font.draw_text(
name.chars(), name.chars(),
self.x as f32 + 20.0, self.x as f32 + 20.0,
y - 2.0, y,
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
ctx, ctx,
@ -268,7 +268,7 @@ impl Menu {
state.font.draw_text( state.font.draw_text(
value_text.chars(), value_text.chars(),
self.x as f32 + 25.0 + name_text_len, self.x as f32 + 25.0 + name_text_len,
y - 2.0, y,
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
ctx, ctx,
@ -281,7 +281,7 @@ impl Menu {
state.font.draw_text( state.font.draw_text(
name.chars(), name.chars(),
self.x as f32 + 20.0, self.x as f32 + 20.0,
y - 2.0, y,
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
ctx, ctx,
@ -290,7 +290,7 @@ impl Menu {
state.font.draw_text( state.font.draw_text(
value_text.chars(), value_text.chars(),
self.x as f32 + 25.0 + name_text_len, self.x as f32 + 25.0 + name_text_len,
y - 2.0, y,
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
ctx, ctx,
@ -304,7 +304,7 @@ impl Menu {
state.font.draw_text( state.font.draw_text(
name.chars(), name.chars(),
self.x as f32 + 20.0, self.x as f32 + 20.0,
y - 2.0, y,
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
ctx, ctx,
@ -313,7 +313,7 @@ impl Menu {
state.font.draw_text( state.font.draw_text(
value_text.chars(), value_text.chars(),
self.x as f32 + 25.0 + name_text_len, self.x as f32 + 25.0 + name_text_len,
y - 2.0, y,
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
ctx, ctx,
@ -322,8 +322,8 @@ impl Menu {
state.font.draw_colored_text( state.font.draw_colored_text(
description_text.chars(), description_text.chars(),
self.x as f32 + 20.0, self.x as f32 + 20.0,
y + 12.0, y + 16.0,
(0xa0, 0xa0, 0xff, 0xff), (0xc0, 0xc0, 0xff, 0xff),
&state.constants, &state.constants,
&mut state.texture_set, &mut state.texture_set,
ctx, ctx,