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

Map Window, Settings Window

Browse Source 
Former-commit-id: 337f21010b8c4250a1eaa7ddfbe8d5f2ea1ac412
This commit is contained in:
Pfauenauge 2019-04-29 00:01:57 +02:00
parent 5852efd896
commit 1109c55671
1 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1047,15 +1047,18 @@ impl Hud {
// 0 Settings // 0 Settings
if let Windows::Settings = self.open_windows { if let Windows::Settings = self.open_windows {
// Frame Alignment // Alignment
Rectangle::fill_with([824.0, 488.0], color::TRANSPARENT) Rectangle::fill_with([824.0, 488.0], color::TRANSPARENT)
.middle_of(ui_widgets.window) .middle_of(ui_widgets.window)
.scroll_kids()
.scroll_kids_vertically()
.set(self.ids.settings_bg, ui_widgets); .set(self.ids.settings_bg, ui_widgets);
// Frame // Frame
Image::new(self.imgs.settings_frame_l) Image::new(self.imgs.settings_frame_l)
.top_left_with_margins_on(self.ids.settings_bg, 0.0, 0.0) .top_left_with_margins_on(self.ids.settings_bg, 0.0, 0.0)
.w_h(412.0, 488.0) .w_h(412.0, 488.0)
.set(self.ids.settings_l, ui_widgets); .set(self.ids.settings_l, ui_widgets);
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
Image::new(self.imgs.settings_frame_r) Image::new(self.imgs.settings_frame_r)
======= =======
@ -1071,6 +1074,12 @@ impl Hud {
.scroll_kids() .scroll_kids()
.scroll_kids_vertically() .scroll_kids_vertically()
.set(self.ids.settings_content, ui_widgets); .set(self.ids.settings_content, ui_widgets);
=======
Image::new(self.imgs.settings_frame_r)
.top_right_with_margins_on(self.ids.settings_bg, 0.0, 0.0)
.w_h(412.0, 488.0)
.set(self.ids.settings_r, ui_widgets);
>>>>>>> Map Window, Settings Window
// X-Button // X-Button
if Button::image(self.imgs.close_button) if Button::image(self.imgs.close_button)
.w_h(28.0, 28.0) .w_h(28.0, 28.0)
@ -1092,9 +1101,15 @@ impl Hud {
.set(self.ids.settings_title, ui_widgets); .set(self.ids.settings_title, ui_widgets);
// Icon // Icon
//Image::new(self.imgs.settings_icon) //Image::new(self.imgs.settings_icon)
<<<<<<< HEAD
//.w_h(224.0 / 3.0, 224.0 / 3.0) //.w_h(224.0 / 3.0, 224.0 / 3.0)
//.top_left_with_margins_on(self.ids.settings_bg, -10.0, -10.0) //.top_left_with_margins_on(self.ids.settings_bg, -10.0, -10.0)
//.set(self.ids.settings_icon, ui_widgets); //.set(self.ids.settings_icon, ui_widgets);
=======
//.w_h(224.0 / 3.0, 224.0 / 3.0)
//.top_left_with_margins_on(self.ids.settings_bg, -10.0, -10.0)
//.set(self.ids.settings_icon, ui_widgets);
>>>>>>> Map Window, Settings Window
// TODO: Find out if we can remove this // TODO: Find out if we can remove this
// 1 Interface//////////////////////////// // 1 Interface////////////////////////////
@ -1568,7 +1583,11 @@ impl Hud {
// 2 Map // 2 Map
if self.map_open { if self.map_open {
<<<<<<< HEAD
// BG // BG
=======
// BG
>>>>>>> Map Window, Settings Window
Rectangle::fill_with([824.0, 976.0], color::TRANSPARENT) Rectangle::fill_with([824.0, 976.0], color::TRANSPARENT)
.mid_top_with_margin_on(ui_widgets.window, 15.0) .mid_top_with_margin_on(ui_widgets.window, 15.0)
.scroll_kids() .scroll_kids()
@ -1580,6 +1599,7 @@ impl Hud {
.w_h(412.0, 488.0) .w_h(412.0, 488.0)
.set(self.ids.map_frame_l, ui_widgets); .set(self.ids.map_frame_l, ui_widgets);
Image::new(self.imgs.map_frame_r) Image::new(self.imgs.map_frame_r)
<<<<<<< HEAD
.right_from(self.ids.map_frame_l, 0.0) .right_from(self.ids.map_frame_l, 0.0)
.w_h(412.0, 488.0) .w_h(412.0, 488.0)
.set(self.ids.map_frame_r, ui_widgets); .set(self.ids.map_frame_r, ui_widgets);
@ -1591,6 +1611,20 @@ impl Hud {
.down_from(self.ids.map_frame_l, 0.0) .down_from(self.ids.map_frame_l, 0.0)
.w_h(412.0, 488.0) .w_h(412.0, 488.0)
.set(self.ids.map_frame_bl, ui_widgets); .set(self.ids.map_frame_bl, ui_widgets);
=======
.top_right_with_margins_on(self.ids.map_bg, 0.0, 0.0)
.w_h(412.0, 488.0)
.set(self.ids.map_frame_r, ui_widgets);
Image::new(self.imgs.map_frame_br)
.bottom_right_with_margins_on(self.ids.map_bg, 0.0, 0.0)
.w_h(412.0, 488.0)
.set(self.ids.map_frame_br, ui_widgets);
Image::new(self.imgs.map_frame_bl)
.bottom_left_with_margins_on(self.ids.map_bg, 0.0, 0.0)
.w_h(412.0, 488.0)
.set(self.ids.map_frame_bl, ui_widgets);
>>>>>>> Map Window, Settings Window
// Icon // Icon
Image::new(self.imgs.map_icon) Image::new(self.imgs.map_icon)
@ -1611,10 +1645,17 @@ impl Hud {
} }
// Title // Title
//Text::new("Map") //Text::new("Map")
<<<<<<< HEAD
//.mid_top_with_margin_on(self.ids.map_bg, -7.0) //.mid_top_with_margin_on(self.ids.map_bg, -7.0)
//.font_size(14) //.font_size(14)
//.color(TEXT_COLOR) //.color(TEXT_COLOR)
//.set(self.ids.map_title, ui_widgets); //.set(self.ids.map_title, ui_widgets);
=======
//.mid_top_with_margin_on(self.ids.map_bg, -7.0)
//.font_size(14)
//.color(TEXT_COLOR)
//.set(self.ids.map_title, ui_widgets);
>>>>>>> Map Window, Settings Window
} }
// ESC-MENU // ESC-MENU