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

rustfmt

Browse Source 
Former-commit-id: 227b7f5a55546c678617d157b739e61f15c4aa4b
This commit is contained in:
Imbris 2019-05-12 00:17:10 -04:00
parent e7ab006db7
commit cec01c0d69
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@ use super::{img_ids::Imgs, Fonts, TEXT_COLOR, XP_COLOR};
use conrod_core::{
color,
widget::{self, Button, Image, Rectangle, Text},
widget_ids, Colorable, Color, Labelable, Positionable, Sizeable, Widget, WidgetCommon,
widget_ids, Color, Colorable, Labelable, Positionable, Sizeable, Widget, WidgetCommon,
};
widget_ids! {
@ -209,7 +209,6 @@ impl<'a> Widget for CharacterWindow<'a> {
.w_h(28.0 * 1.8, 28.0 * 1.8)
.up_from(state.belt_bg, 10.0)
.color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.1)))
.color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.1)))
.set(state.hands_bg, ui);
Button::image(self.imgs.grid)
.w_h(28.0 * 1.8, 28.0 * 1.8)
@ -217,7 +216,7 @@ impl<'a> Widget for CharacterWindow<'a> {
.set(state.hands_grid, ui);
// Shoulders
Image::new(self.imgs.shoulders_bg)
.w_h(28.0 * 1.8, 28.0 * 1.8)
.w_h(28.0 * 1.8, 28.0 * 1.8)
.up_from(state.hands_bg, 10.0)
.color(Some(Color::Rgba(1.0, 1.0, 1.0, 0.1)))
.set(state.shoulders_bg, ui);

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

@ -3,7 +3,7 @@ use crate::ui::img_ids::{BlankGraphic, ImageGraphic, VoxelGraphic, VoxelMs9Graph
image_ids! {
pub struct Imgs {
<VoxelGraphic>
// Bag
bag_contents: "/voxygen/element/frames/bag.vox",
inv_grid: "/voxygen/element/frames/inv_grid.vox",

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

@ -71,7 +71,7 @@ impl<'a> Widget for Map<'a> {
.scroll_kids()
.scroll_kids_vertically()
.set(state.ids.map_bg, ui);
// Frame
Image::new(self.imgs.map_frame_l)
.top_left_with_margins_on(state.ids.map_bg, 0.0, 0.0)