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: 44e8406af9c2b6db60f78f7ff161b7c700f024fd
This commit is contained in:
Pfauenauge 2019-05-10 14:43:14 +02:00 committed by Imbris
parent 0f6ec8dce3
commit 15816bdf6d
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/frames/tab_bg.vox (Stored with Git LFS)
View File

Binary file not shown.

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

@ -13,7 +13,7 @@ widget_ids! {
charwindow_exp_progress_rectangle,
charwindow_exp_rectangle,
charwindow_frame,
charwindow_icon,
// charwindow_icon,
charwindow_rectangle,
charwindow_tab1,
charwindow_tab1_exp,
@ -28,7 +28,7 @@ widget_ids! {
tab_small_open,
tab_small_closed,
xp_charwindow,
divider,
divider_1,
}
}
@ -76,24 +76,24 @@ impl<'a> Widget for CharacterWindow<'a> {
let xp_percentage = 0.4;
// Frame
Image::new(self.imgs.window_frame)
Image::new(self.imgs.window_3)
.middle_of(id)
.top_left_with_margins_on(ui.window, 200.0, 215.0)
.w_h(107.0 * 4.0, 125.0 * 4.0)
.top_left_with_margins_on(ui.window, 212.0, 215.0)
.w_h(103.0 * 4.0, 122.0 * 4.0)
.set(state.charwindow_frame, ui);
// Icon
Image::new(self.imgs.charwindow_icon)
.w_h(40.0, 40.0)
.top_left_with_margins_on(state.charwindow_frame, 4.0, 4.0)
.set(state.charwindow_icon, ui);
//Image::new(self.imgs.charwindow_icon)
//.w_h(40.0, 40.0)
//.top_left_with_margins_on(state.charwindow_frame, 4.0, 4.0)
//.set(state.charwindow_icon, ui);
// X-Button
if Button::image(self.imgs.close_button)
.w_h(28.0, 28.0)
.hover_image(self.imgs.close_button_hover)
.press_image(self.imgs.close_button_press)
.top_right_with_margins_on(state.charwindow_frame, 12.0, 0.0)
.top_right_with_margins_on(state.charwindow_frame, 0.0, 0.0)
.set(state.charwindow_close, ui)
.was_clicked()
{
@ -102,21 +102,21 @@ impl<'a> Widget for CharacterWindow<'a> {
// Title
Text::new("Character Name") // Add in actual Character Name
.mid_top_with_margin_on(state.charwindow_frame, 17.0)
.mid_top_with_margin_on(state.charwindow_frame, 4.0)
.font_id(self.fonts.metamorph)
.font_size(14)
.color(TEXT_COLOR)
.set(state.charwindow_title, ui);
// Tab BG
Image::new(self.imgs.charwindow_tab_bg)
.w_h(205.0, 412.0)
.mid_left_with_margin_on(state.charwindow_frame, -205.0)
Image::new(self.imgs.tab_bg)
.w_h(50.0*4.0, 115.0*4.0)
.top_left_with_margins_on(state.charwindow_frame,28.0, -200.0)
.set(state.charwindow_tab_bg, ui);
// Tab Rectangle
Rectangle::fill_with([192.0, 371.0], color::rgba(0.0, 0.0, 0.0, 0.8))
.top_right_with_margins_on(state.charwindow_tab_bg, 20.0, 0.0)
Rectangle::fill_with([45.0*4.0, 104.0*4.0], color::TRANSPARENT)
.top_left_with_margins_on(state.charwindow_tab_bg, 7.0*4.0, 4.0*4.0)
.set(state.charwindow_rectangle, ui);
// Tab Button