From 12347ead0b649b560e9b17bcaf48af12d51fdfd9 Mon Sep 17 00:00:00 2001 From: Pfauenauge Date: Mon, 29 Apr 2019 20:51:26 +0200 Subject: [PATCH] settings window Former-commit-id: 3cefa7cc816206fd777f4a94a9b9a1689ed9aa03 --- voxygen/src/hud/mod.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 22fee0f05b..cd9f7e32db 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -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 {