From 5852efd89601db6f14c161fbc767dcd4853da2f0 Mon Sep 17 00:00:00 2001 From: Pfauenauge Date: Mon, 29 Apr 2019 20:13:22 +0200 Subject: [PATCH] settings window Former-commit-id: 41d85bdc41507bb8c26e5cda2db3135200db7be5 --- voxygen/src/hud/mod.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 1491e6b959..82d21fe9cf 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -1047,18 +1047,20 @@ impl Hud { // 0 Settings if let Windows::Settings = self.open_windows { - // Alignment + // Frame Alignment Rectangle::fill_with([824.0, 488.0], color::TRANSPARENT) - .middle_of(ui_widgets.window) - .scroll_kids() - .scroll_kids_vertically() + .middle_of(ui_widgets.window) .set(self.ids.settings_bg, ui_widgets); // Frame Image::new(self.imgs.settings_frame_l) .top_left_with_margins_on(self.ids.settings_bg, 0.0, 0.0) .w_h(412.0, 488.0) .set(self.ids.settings_l, ui_widgets); +<<<<<<< HEAD Image::new(self.imgs.settings_frame_r) +======= + Image::new(self.imgs.settings_frame_r) +>>>>>>> settings window .right_from(self.ids.settings_l, 0.0) .parent(self.ids.settings_bg) .w_h(412.0, 488.0)