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

positioning

Browse Source 
Former-commit-id: 7583dfac4be650ecabaf49608712c8d3cb952bf5
This commit is contained in:
Pfauenauge 2019-05-10 23:49:14 +02:00 committed by Imbris
parent d772e2f8e4
commit 789e448aa3
2 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/icons/head.vox (Stored with Git LFS)
View File

Binary file not shown.

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

@ -130,7 +130,7 @@ impl<'a> Widget for CharacterWindow<'a> {
// Title // Title
Text::new("Character Name") // Add in actual Character Name Text::new("Character Name") // Add in actual Character Name
.mid_top_with_margin_on(state.charwindow_frame, 4.0) .mid_top_with_margin_on(state.charwindow_frame, 6.0)
.font_id(self.fonts.metamorph) .font_id(self.fonts.metamorph)
.font_size(14) .font_size(14)
.color(TEXT_COLOR) .color(TEXT_COLOR)
@ -152,43 +152,15 @@ impl<'a> Widget for CharacterWindow<'a> {
.w_h(28.0 * 2.0, 28.0 * 2.0) .w_h(28.0 * 2.0, 28.0 * 2.0)
.middle_of(state.head_bg) .middle_of(state.head_bg)
.set(state.head_grid, ui); .set(state.head_grid, ui);
// Shoulders
// Ring R
Image::new(self.imgs.head_bg) Image::new(self.imgs.head_bg)
.w_h(28.0 * 2.0, 28.0 * 2.0) .w_h(28.0 * 2.0, 28.0 * 2.0)
.bottom_right_with_margins_on(state.content_align, 20.0, 20.0) .top_right_with_margins_on(state.content_align, 65.0, 40.0)
.set(state.ring_r_bg, ui); .set(state.shoulders_bg, ui);
Button::image(self.imgs.grid) Button::image(self.imgs.grid)
.w_h(28.0 * 2.0, 28.0 * 2.0) .w_h(28.0 * 2.0, 28.0 * 2.0)
.middle_of(state.ring_r_bg) .middle_of(state.shoulders_bg)
.set(state.ring_r_grid, ui); .set(state.shoulders_grid, ui);
// Feet
Image::new(self.imgs.head_bg)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.up_from(state.ring_r_bg, 10.0)
.set(state.feet_bg, ui);
Button::image(self.imgs.grid)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.middle_of(state.feet_bg)
.set(state.feet_grid, ui);
// Legs
Image::new(self.imgs.head_bg)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.up_from(state.feet_bg, 10.0)
.set(state.legs_bg, ui);
Button::image(self.imgs.grid)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.middle_of(state.legs_bg)
.set(state.legs_grid, ui);
// Belt
Image::new(self.imgs.head_bg)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.up_from(state.legs_bg, 10.0)
.set(state.belt_bg, ui);
Button::image(self.imgs.grid)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.middle_of(state.belt_bg)
.set(state.belt_grid, ui);
// Hands // Hands
Image::new(self.imgs.head_bg) Image::new(self.imgs.head_bg)
.w_h(28.0 * 2.0, 28.0 * 2.0) .w_h(28.0 * 2.0, 28.0 * 2.0)
@ -198,15 +170,42 @@ impl<'a> Widget for CharacterWindow<'a> {
.w_h(28.0 * 2.0, 28.0 * 2.0) .w_h(28.0 * 2.0, 28.0 * 2.0)
.middle_of(state.hands_bg) .middle_of(state.hands_bg)
.set(state.hands_grid, ui); .set(state.hands_grid, ui);
// Shoulders // Belt
Image::new(self.imgs.head_bg) Image::new(self.imgs.head_bg)
.w_h(28.0 * 2.0, 28.0 * 2.0) .w_h(28.0 * 2.0, 28.0 * 2.0)
.up_from(state.hands_bg, 10.0) .up_from(state.legs_bg, 10.0)
.set(state.shoulders_bg, ui); .set(state.belt_bg, ui);
Button::image(self.imgs.grid) Button::image(self.imgs.grid)
.w_h(28.0 * 2.0, 28.0 * 2.0) .w_h(28.0 * 2.0, 28.0 * 2.0)
.middle_of(state.shoulders_bg) .middle_of(state.belt_bg)
.set(state.shoulders_grid, ui); .set(state.belt_grid, ui);
// Legs
Image::new(self.imgs.head_bg)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.up_from(state.feet_bg, 10.0)
.set(state.legs_bg, ui);
Button::image(self.imgs.grid)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.middle_of(state.legs_bg)
.set(state.legs_grid, ui);
// Feet
Image::new(self.imgs.head_bg)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.up_from(state.ring_r_bg, 10.0)
.set(state.feet_bg, ui);
Button::image(self.imgs.grid)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.middle_of(state.feet_bg)
.set(state.feet_grid, ui);
// Ring R
Image::new(self.imgs.head_bg)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.bottom_right_with_margins_on(state.content_align, 20.0, 20.0)
.set(state.ring_r_bg, ui);
Button::image(self.imgs.grid)
.w_h(28.0 * 2.0, 28.0 * 2.0)
.middle_of(state.ring_r_bg)
.set(state.ring_r_grid, ui);
// Ring L // Ring L
Image::new(self.imgs.head_bg) Image::new(self.imgs.head_bg)
.w_h(28.0 * 2.0, 28.0 * 2.0) .w_h(28.0 * 2.0, 28.0 * 2.0)
@ -255,7 +254,7 @@ impl<'a> Widget for CharacterWindow<'a> {
//Necklace //Necklace
Image::new(self.imgs.head_bg) Image::new(self.imgs.head_bg)
.w_h(28.0 * 2.0, 28.0 * 2.0) .w_h(28.0 * 2.0, 28.0 * 2.0)
.up_from(state.gem_bg, 10.0) .top_left_with_margins_on(state.content_align, 65.0, 40.0)
.set(state.necklace_bg, ui); .set(state.necklace_bg, ui);
Button::image(self.imgs.grid) Button::image(self.imgs.grid)
.w_h(28.0 * 2.0, 28.0 * 2.0) .w_h(28.0 * 2.0, 28.0 * 2.0)