mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
removed test_assets in voxygen
Former-commit-id: 6f2a995cf6905066e41d4224016b3d63dfbcacca
This commit is contained in:
parent
60017a4f99
commit
33515bd04c
@ -1 +1 @@
|
||||
Subproject commit 25346c1ead7d03b11f7f4403332f2288824c6ca9
|
||||
Subproject commit b5c4e96c490667d4aef061f5e1792c196b9c88d0
|
@ -633,13 +633,18 @@ impl Hud {
|
||||
//Image::new(self.imgs.mmap_frame_bg)
|
||||
//.w_h(1750.0 / 8.0, 1650.0 / 8.0)
|
||||
//.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0)
|
||||
//.set(self.ids.mmap_frame_bg, ui_widgets);
|
||||
//.set(self.ids.mmap_frame_bg, ui_widgets);
|
||||
|
||||
|
||||
Image::new(self.imgs.mmap_frame)
|
||||
.w_h(1750.0 / 8.0, 1650.0 / 8.0)
|
||||
.w_h(100.0*2.5, 100.0*2.5)
|
||||
.top_right_with_margins_on(ui_widgets.window, 5.0, 5.0)
|
||||
.set(self.ids.mmap_frame, ui_widgets);
|
||||
|
||||
Rectangle::fill_with([92.0*2.5, 82.0*2.5], color::RED)
|
||||
.mid_top_with_margin_on(self.ids.mmap_frame, 13.0*2.5+2.5)
|
||||
.set(self.ids.mmap_frame_bg, ui_widgets);
|
||||
|
||||
// Title
|
||||
// Make it display the actual location
|
||||
Text::new("Uncanny Valley")
|
||||
@ -1236,7 +1241,7 @@ impl Hud {
|
||||
}
|
||||
// Title
|
||||
Text::new("Social")
|
||||
.mid_top_with_margin_on(self.ids.social_frame, 16.0)
|
||||
.mid_top_with_margin_on(self.ids.social_frame, 17.0)
|
||||
.font_id(self.font_metamorph)
|
||||
.font_size(14)
|
||||
.color(TEXT_COLOR)
|
||||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue
Block a user