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

settings window

Browse Source 
Former-commit-id: 3cefa7cc816206fd777f4a94a9b9a1689ed9aa03
This commit is contained in:
Pfauenauge 2019-04-29 20:51:26 +02:00
parent cbd754bd90
commit 12347ead0b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1082,7 +1082,7 @@ impl Hud {
>>>>>>> Map Window, Settings Window
=======
// Content Alignment
Rectangle::fill_with([189.0*4.0, 97.0*4.0], color::TRANSPARENT)
Rectangle::fill_with([198.0*4.0, 97.0*4.0], color::TRANSPARENT)
.top_right_with_margins_on(self.ids.settings_r, 21.0*4.0, 4.0*4.0)
.scroll_kids()
.scroll_kids_vertically()
@ -1117,8 +1117,12 @@ impl Hud {
//.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);
<<<<<<< HEAD
>>>>>>> Map Window, Settings Window
// TODO: Find out if we can remove this
=======
// TODO: Find out if we can remove this
>>>>>>> settings window
// 1 Interface////////////////////////////
if Button::image(if let SettingsTab::Interface = self.settings_tab {