diff --git a/voxygen/src/assets/ids.rs b/voxygen/src/assets/ids.rs index 238d3076fb..aa61686cca 100644 --- a/voxygen/src/assets/ids.rs +++ b/voxygen/src/assets/ids.rs @@ -49,7 +49,7 @@ macro_rules! image_ids { impl $Ids { pub fn load(ui: &mut Ui) -> Result { Ok(Self { - $( $name: Id::to_ui_asset(<$T>::load($file)?, ui), )* + $( $name: UiId::to_ui_asset(<$T>::load($file)?, ui), )* }) } } diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs index 42d2704b4b..1eeded801b 100644 --- a/voxygen/src/menu/char_selection/ui.rs +++ b/voxygen/src/menu/char_selection/ui.rs @@ -1,4 +1,5 @@ use crate::{ + assets, render::Renderer, ui::{self, ScaleMode, Ui}, window::Window, diff --git a/voxygen/src/menu/main/ui.rs b/voxygen/src/menu/main/ui.rs index f669ec1e42..81b88aff6d 100644 --- a/voxygen/src/menu/main/ui.rs +++ b/voxygen/src/menu/main/ui.rs @@ -1,10 +1,11 @@ use crate::{ + assets, render::Renderer, ui::{self, ScaleMode, Ui}, window::Window, GlobalState, DEFAULT_PUBLIC_SERVER, }; -use common::{assets, figure::Segment}; +use common::figure::Segment; use conrod_core::{ color, color::TRANSPARENT,