From 96c3597c67e5bcf6048f962f3b391521b6ed66e1 Mon Sep 17 00:00:00 2001 From: "Elijah C. Voigt" Date: Wed, 22 Nov 2023 20:24:02 -0800 Subject: [PATCH] Use Sam's 2d/3d toggle button icons --- assets/images/2DIcon.png | 3 +++ assets/images/2d-icon.png | 3 --- assets/images/3DIcon.png | 3 +++ assets/images/3d-icon.png | 3 --- src/ui.rs | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 assets/images/2DIcon.png delete mode 100644 assets/images/2d-icon.png create mode 100644 assets/images/3DIcon.png delete mode 100644 assets/images/3d-icon.png diff --git a/assets/images/2DIcon.png b/assets/images/2DIcon.png new file mode 100644 index 0000000..3d52bc9 --- /dev/null +++ b/assets/images/2DIcon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4770f1bb05387f7a0b16049e09ab0a32f1952f14c5dd9d4cc28f76157b021774 +size 12958 diff --git a/assets/images/2d-icon.png b/assets/images/2d-icon.png deleted file mode 100644 index 642e2ae..0000000 --- a/assets/images/2d-icon.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61ead1f31c0b9279a50023b85c7bebef3e8326e48227523ebbd0a565979207cd -size 1015 diff --git a/assets/images/3DIcon.png b/assets/images/3DIcon.png new file mode 100644 index 0000000..cc49a12 --- /dev/null +++ b/assets/images/3DIcon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:429829f01d3f89c498d42f266d1d78ee97c763d8356dc9ac8871eccf78183cba +size 14573 diff --git a/assets/images/3d-icon.png b/assets/images/3d-icon.png deleted file mode 100644 index d5655be..0000000 --- a/assets/images/3d-icon.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:795ce33bac5563f6d12cd0530cd8b5f47f26b43bceb83286b12853176227a567 -size 1127 diff --git a/src/ui.rs b/src/ui.rs index 82e525e..b337e8a 100644 --- a/src/ui.rs +++ b/src/ui.rs @@ -29,7 +29,6 @@ fn initialize(mut commands: Commands) { .spawn(( NodeBundle { style: Style { - padding: UiRect::all(Val::Px(10.0)), position_type: PositionType::Absolute, right: Val::Px(5.0), bottom: Val::Px(5.0), @@ -45,7 +44,8 @@ fn initialize(mut commands: Commands) { parent.spawn(( ButtonBundle { style: Style { - padding: UiRect::all(Val::Px(10.0)), + width: Val::Px(25.0), + height: Val::Px(25.0), ..default() }, background_color: Color::WHITE.into(), @@ -83,8 +83,8 @@ fn sync_display_mode( ) { query.iter_mut().for_each(|(mut image, mut display_state)| { let (texture, target_state) = match state.get() { - DisplayState::Display2d => (server.load("images/3d-icon.png"), DisplayState::Display3d), - DisplayState::Display3d => (server.load("images/2d-icon.png"), DisplayState::Display2d), + DisplayState::Display2d => (server.load("images/3DIcon.png"), DisplayState::Display3d), + DisplayState::Display3d => (server.load("images/2DIcon.png"), DisplayState::Display2d), }; *image = UiImage { texture,