integrate all toolbar icons

Uriopass · Jan 25, 2024 · f4a4d70 · f4a4d70
1 parent 05494cb
commit f4a4d70
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 37 deletions.
diff --git a/assets/ui/bulldozer.png → assets/ui/bulldozer_old.png b/assets/ui/bulldozer.png → assets/ui/bulldozer_old.png
diff --git a/assets/ui/icons/curved_road.png b/assets/ui/icons/curved_road.png
diff --git a/assets/ui/icons/select_triangle_under.png b/assets/ui/icons/select_triangle_under.png
diff --git a/assets/ui/icons/straight_road.png b/assets/ui/icons/straight_road.png
diff --git a/assets/ui/icons/toolbar_bulldozer.png b/assets/ui/icons/toolbar_bulldozer.png
diff --git a/assets/ui/icons/toolbar_companies.png b/assets/ui/icons/toolbar_companies.png
diff --git a/assets/ui/icons/toolbar_curved_road.png b/assets/ui/icons/toolbar_curved_road.png
diff --git a/assets/ui/icons/toolbar_housetool.png b/assets/ui/icons/toolbar_housetool.png
diff --git a/assets/ui/icons/toolbar_road_edit.png b/assets/ui/icons/toolbar_road_edit.png
diff --git a/assets/ui/icons/toolbar_straight_road.png b/assets/ui/icons/toolbar_straight_road.png
diff --git a/assets/ui/icons/toolbar_terraform.png b/assets/ui/icons/toolbar_terraform.png
diff --git a/assets/ui/icons/toolbar_train.png b/assets/ui/icons/toolbar_train.png
diff --git a/assets/ui/road_edit.png → assets/ui/road_edit_old.png b/assets/ui/road_edit.png → assets/ui/road_edit_old.png
diff --git a/native_app/src/gui/mod.rs b/native_app/src/gui/mod.rs
@@ -183,12 +183,15 @@ impl UiTextures {
     }
 
     pub fn get(&self, name: &str) -> TextureId {
-        self.textures.get(name).unwrap().id()
+        match self.textures.get(name) {
+            None => panic!("Couldn't find texture (egui) {}", name),
+            Some(x) => x.id(),
+        }
     }
 
     pub fn get_yakui(&self, name: &str) -> yakui::TextureId {
         match self.yakui_textures.get(name) {
-            None => panic!("Couldn't find texture {}", name),
+            None => panic!("Couldn't find texture (yakui) {}", name),
             Some(x) => *x,
         }
     }

diff --git a/native_app/src/gui/topgui.rs b/native_app/src/gui/topgui.rs
@@ -185,10 +185,10 @@ impl Gui {
         let tools = [
             ("road", Tab::Roadbuild, Tool::RoadbuildStraight),
             ("curved", Tab::Roadcurved, Tool::RoadbuildCurved),
-            ("road_edit", Tab::Roadeditor, Tool::RoadEditor),
+            ("road_edit_old", Tab::Roadeditor, Tool::RoadEditor),
             ("housebrush", Tab::Housebrush, Tool::LotBrush),
             ("buildings", Tab::Roadbuilding, Tool::SpecialBuilding),
-            ("bulldozer", Tab::Bulldozer, Tool::Bulldozer),
+            ("bulldozer_old", Tab::Bulldozer, Tool::Bulldozer),
             ("traintool", Tab::Train, Tool::Train),
             ("terraform", Tab::Terraforming, Tool::Terraforming),
         ];

diff --git a/native_app/src/newgui/topgui.rs b/native_app/src/newgui/topgui.rs
@@ -1,8 +1,8 @@
 use ordered_float::OrderedFloat;
 use yakui::widgets::{List, Pad};
 use yakui::{
-    constrained, reflow, row, spacer, Alignment, Color, Constraints, CrossAxisAlignment, Dim2,
-    MainAxisAlignment, MainAxisSize, Vec2,
+    column, constrained, image, reflow, row, spacer, Alignment, Color, Constraints,
+    CrossAxisAlignment, Dim2, MainAxisAlignment, MainAxisSize, Vec2,
 };
 
 use goryak::{
@@ -145,14 +145,14 @@ impl Gui {
         }
 
         let tools = [
-            ("straight_road", Tool::RoadbuildStraight),
-            ("curved_road", Tool::RoadbuildCurved),
-            //("road_edit", Tool::RoadEditor),
-            //("housebrush", Tool::LotBrush),
-            //("buildings", Tool::SpecialBuilding),
-            //("bulldozer", Tool::Bulldozer),
-            //("traintool", Tool::Train),
-            //("terraform", Tool::Terraforming),
+            ("toolbar_straight_road", Tool::RoadbuildStraight),
+            ("toolbar_curved_road", Tool::RoadbuildCurved),
+            ("toolbar_road_edit", Tool::RoadEditor),
+            ("toolbar_housetool", Tool::LotBrush),
+            ("toolbar_companies", Tool::SpecialBuilding),
+            ("toolbar_bulldozer", Tool::Bulldozer),
+            ("toolbar_train", Tool::Train),
+            ("toolbar_terraform", Tool::Terraforming),
         ];
 
         yakui::reflow(Alignment::TOP_LEFT, Dim2::ZERO, || {
@@ -167,25 +167,45 @@ impl Gui {
                             padxy(0.0, 10.0, || {
                                 let mut l = List::row();
                                 l.main_axis_alignment = MainAxisAlignment::Center;
+                                l.item_spacing = 10.0;
                                 l.show(|| {
                                     for (name, tool) in &tools {
-                                        let tint = if *tool == *uiworld.read::<Tool>() {
-                                            primary()
-                                        } else {
-                                            Color::WHITE
-                                        };
-
-                                        if image_button(
-                                            uiworld.read::<UiTextures>().get_yakui(name),
-                                            Vec2::new(64.0, 64.0),
-                                            tint,
-                                            Color::WHITE.with_alpha(0.7),
-                                            primary(),
-                                        )
-                                        .clicked
-                                        {
-                                            *uiworld.write::<Tool>() = *tool;
-                                        }
+                                        let (default_col, hover_col) =
+                                            if *tool == *uiworld.read::<Tool>() {
+                                                let c = primary().lerp(&Color::WHITE, 0.3);
+                                                (c, c)
+                                            } else {
+                                                (Color::WHITE, Color::WHITE.with_alpha(0.7))
+                                            };
+
+                                        column(|| {
+                                            if image_button(
+                                                uiworld.read::<UiTextures>().get_yakui(name),
+                                                Vec2::new(64.0, 64.0),
+                                                default_col,
+                                                hover_col,
+                                                primary(),
+                                            )
+                                            .clicked
+                                            {
+                                                *uiworld.write::<Tool>() = *tool;
+                                            }
+
+                                            if *tool == *uiworld.read::<Tool>() {
+                                                reflow(
+                                                    Alignment::CENTER_LEFT,
+                                                    Dim2::pixels(0.0, 32.0),
+                                                    || {
+                                                        image(
+                                                            uiworld
+                                                                .read::<UiTextures>()
+                                                                .get_yakui("select_triangle_under"),
+                                                            Vec2::new(64.0, 10.0),
+                                                        );
+                                                    },
+                                                );
+                                            }
+                                        });
                                     }
                                 });
                             });