Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move font_ids! into mod.rs

Browse Source 
Former-commit-id: 602ea44814a25c068e5c022cedc780e3ddc020ae
This commit is contained in:
timokoesters 2019-05-08 22:25:15 +02:00
parent 854271f321
commit 2309ce599c
14 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/src/hud/bag.rs
View File

@ -1,4 +1,4 @@
use super::{font_ids::Fonts, img_ids::Imgs}; use super::{img_ids::Imgs, Fonts};
use conrod_core::{ use conrod_core::{
color, color,
widget::{self, Button, Image, Rectangle, Scrollbar}, widget::{self, Button, Image, Rectangle, Scrollbar},

2
voxygen/src/hud/buttons.rs
View File

@ -3,7 +3,7 @@ use conrod_core::{
widget_ids, Colorable, Labelable, Positionable, Sizeable, Widget, WidgetCommon, widget_ids, Colorable, Labelable, Positionable, Sizeable, Widget, WidgetCommon,
}; };
use super::{font_ids::Fonts, img_ids::Imgs, small_window::SmallWindowType, Windows, TEXT_COLOR}; use super::{img_ids::Imgs, small_window::SmallWindowType, Fonts, Windows, TEXT_COLOR};
use crate::ui::ToggleButton; use crate::ui::ToggleButton;
widget_ids! { widget_ids! {

2
voxygen/src/hud/character_window.rs
View File

@ -1,4 +1,4 @@
use super::{font_ids::Fonts, img_ids::Imgs, TEXT_COLOR, XP_COLOR}; use super::{img_ids::Imgs, Fonts, TEXT_COLOR, XP_COLOR};
use conrod_core::{ use conrod_core::{
color, color,
widget::{self, Button, Image, Rectangle, Text}, widget::{self, Button, Image, Rectangle, Text},

2
voxygen/src/hud/chat.rs
View File

@ -1,4 +1,4 @@
use super::{font_ids::Fonts, img_ids::Imgs, TEXT_COLOR}; use super::{img_ids::Imgs, Fonts, TEXT_COLOR};
use conrod_core::{ use conrod_core::{
input::Key, input::Key,
position::Dimension, position::Dimension,

2
voxygen/src/hud/esc_menu.rs
View File

@ -3,7 +3,7 @@ use conrod_core::{
widget_ids, Labelable, Positionable, Sizeable, Widget, WidgetCommon, widget_ids, Labelable, Positionable, Sizeable, Widget, WidgetCommon,
}; };
use super::{font_ids::Fonts, img_ids::Imgs, TEXT_COLOR}; use super::{img_ids::Imgs, Fonts, TEXT_COLOR};
widget_ids! { widget_ids! {
struct Ids { struct Ids {

6
voxygen/src/hud/font_ids.rs
View File

@ -1,6 +0,0 @@
font_ids! {
pub struct Fonts {
opensans: "/voxygen/font/OpenSans-Regular.ttf",
metamorph: "/voxygen/font/Metamorphous-Regular.ttf",
}
}

2
voxygen/src/hud/map.rs
View File

@ -4,7 +4,7 @@ use conrod_core::{
widget_ids, Positionable, Sizeable, Widget, WidgetCommon, widget_ids, Positionable, Sizeable, Widget, WidgetCommon,
}; };
use super::{font_ids::Fonts, img_ids::Imgs}; use super::{img_ids::Imgs, Fonts};
widget_ids! { widget_ids! {
struct Ids { struct Ids {

2
voxygen/src/hud/minimap.rs
View File

@ -4,7 +4,7 @@ use conrod_core::{
widget_ids, Colorable, Positionable, Sizeable, Widget, WidgetCommon, widget_ids, Colorable, Positionable, Sizeable, Widget, WidgetCommon,
}; };
use super::{font_ids::Fonts, img_ids::Imgs, Show, TEXT_COLOR}; use super::{img_ids::Imgs, Fonts, Show, TEXT_COLOR};
widget_ids! { widget_ids! {
struct Ids { struct Ids {

9
voxygen/src/hud/mod.rs
View File

@ -3,7 +3,6 @@ mod buttons;
mod character_window; mod character_window;
mod chat; mod chat;
mod esc_menu; mod esc_menu;
mod font_ids;
mod img_ids; mod img_ids;
mod map; mod map;
mod minimap; mod minimap;
@ -16,7 +15,6 @@ use buttons::Buttons;
use character_window::CharacterWindow; use character_window::CharacterWindow;
use chat::Chat; use chat::Chat;
use esc_menu::EscMenu; use esc_menu::EscMenu;
use font_ids::Fonts;
use img_ids::Imgs; use img_ids::Imgs;
use map::Map; use map::Map;
use minimap::MiniMap; use minimap::MiniMap;
@ -83,6 +81,13 @@ widget_ids! {
} }
} }
font_ids! {
pub struct Fonts {
opensans: "/voxygen/font/OpenSans-Regular.ttf",
metamorph: "/voxygen/font/Metamorphous-Regular.ttf",
}
}
pub enum Event { pub enum Event {
SendMessage(String), SendMessage(String),
Logout, Logout,

2
voxygen/src/hud/settings_window.rs
View File

@ -1,4 +1,4 @@
use super::{font_ids::Fonts, img_ids::Imgs, TEXT_COLOR}; use super::{img_ids::Imgs, Fonts, TEXT_COLOR};
use crate::{hud::Show, ui::ToggleButton}; use crate::{hud::Show, ui::ToggleButton};
use conrod_core::{ use conrod_core::{
color, color,

2
voxygen/src/hud/skillbar.rs
View File

@ -1,4 +1,4 @@
use super::{font_ids::Fonts, img_ids::Imgs, HP_COLOR, MANA_COLOR, TEXT_COLOR, XP_COLOR}; use super::{img_ids::Imgs, Fonts, HP_COLOR, MANA_COLOR, TEXT_COLOR, XP_COLOR};
use conrod_core::{ use conrod_core::{
widget::{self, Image, Rectangle, Text}, widget::{self, Image, Rectangle, Text},
widget_ids, Colorable, Positionable, Sizeable, Widget, WidgetCommon, widget_ids, Colorable, Positionable, Sizeable, Widget, WidgetCommon,

2
voxygen/src/hud/small_window.rs
View File

@ -1,4 +1,4 @@
use super::{font_ids::Fonts, img_ids::Imgs, Windows, TEXT_COLOR}; use super::{img_ids::Imgs, Fonts, Windows, TEXT_COLOR};
use crate::hud::Show; use crate::hud::Show;
use conrod_core::{ use conrod_core::{
color, color,

2
voxygen/src/menu/char_selection/ui.rs
View File

@ -1,6 +1,6 @@
use crate::{ use crate::{
render::Renderer, render::Renderer,
ui::{self, Graphic, ScaleMode, Ui,BlankGraphic, ImageGraphic, VoxelGraphic}, ui::{self, BlankGraphic, Graphic, ImageGraphic, ScaleMode, Ui, VoxelGraphic},
window::Window, window::Window,
}; };
use common::{ use common::{

2
voxygen/src/menu/main/ui.rs
View File

@ -1,6 +1,6 @@
use crate::{ use crate::{
render::Renderer, render::Renderer,
ui::{self, Graphic, ScaleMode, Ui, BlankGraphic, ImageGraphic, VoxelGraphic}, ui::{self, BlankGraphic, Graphic, ImageGraphic, ScaleMode, Ui, VoxelGraphic},
GlobalState, DEFAULT_PUBLIC_SERVER, GlobalState, DEFAULT_PUBLIC_SERVER,
}; };
use common::assets; use common::assets;