move economy to newgui

Uriopass · Feb 5, 2024 · 2101246 · 2101246
1 parent 902c484
commit 2101246
Show file tree

Hide file tree

Showing 45 changed files with 894 additions and 1,095 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/assets_gui/src/yakui_gui.rs b/assets_gui/src/yakui_gui.rs
@@ -1,4 +1,4 @@
-use yakui::widgets::{List, Pad, StateResponse};
+use yakui::widgets::{CountGrid, List, Pad, StateResponse};
 use yakui::{
     colored_box_container, column, constrained, row, use_state, Constraints, CrossAxisAlignment,
     MainAxisAlignment, MainAxisSize, Response, Vec2,
@@ -11,8 +11,7 @@ use geom::Matrix4;
 use goryak::{
     background, button_primary, checkbox_value, divider, dragvalue, icon, interact_box_radius,
     is_hovered, on_secondary_container, on_surface, outline_variant, round_rect, scroll_vertical,
-    secondary_container, set_theme, surface, surface_variant, textc, use_changed, CountGrid,
-    RoundRect, Theme,
+    secondary_container, set_theme, surface, surface_variant, textc, use_changed, RoundRect, Theme,
 };
 use prototypes::{prototypes_iter, GoodsCompanyID, GoodsCompanyPrototype};
 

diff --git a/goryak/src/count_grid.rs b/goryak/src/count_grid.rs
diff --git a/goryak/src/lib.rs b/goryak/src/lib.rs
@@ -1,7 +1,6 @@
 mod blur_bg;
 mod combo_box;
 mod constrained_viewport;
-mod count_grid;
 mod divider;
 mod dragvalue;
 mod hovered;
@@ -11,6 +10,7 @@ mod interact_box;
 mod layout;
 mod roundrect;
 mod scroll;
+mod selectable_label;
 mod text;
 mod theme;
 mod tooltip;
@@ -20,7 +20,6 @@ mod window;
 pub use blur_bg::*;
 pub use combo_box::*;
 pub use constrained_viewport::*;
-pub use count_grid::*;
 pub use divider::*;
 pub use dragvalue::*;
 pub use hovered::*;
@@ -30,6 +29,7 @@ pub use interact_box::*;
 pub use layout::*;
 pub use roundrect::*;
 pub use scroll::*;
+pub use selectable_label::*;
 pub use text::*;
 pub use theme::*;
 pub use util::*;