From 6a1d1bb535795a7ed4e8c8e8c73e8174330a4f45 Mon Sep 17 00:00:00 2001
From: Imbris <hank.aa7@gmail.com>
Date: Fri, 12 Apr 2019 14:57:56 -0400
Subject: [PATCH 1/2] remove hidden chat scrollbar

Former-commit-id: fc534a2d71bbdbf2989b9772c7d5a64aa44f1ed9
---
 voxygen/src/hud/chat.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/voxygen/src/hud/chat.rs b/voxygen/src/hud/chat.rs
index 56fbab83a1..400d42ddf6 100644
--- a/voxygen/src/hud/chat.rs
+++ b/voxygen/src/hud/chat.rs
@@ -106,11 +106,9 @@ impl Chat {
             .rgba(0.0, 0.0, 0.0, 0.4)
             .up_from(self.ids.input, 0.0)
             .set(self.ids.message_box_bg, ui_widgets);
-        let (mut items, scrollbar) = List::flow_down(self.messages.len())
+        let (mut items, _scrollbar) = List::flow_down(self.messages.len())
             .middle_of(self.ids.message_box_bg)
-            .scrollbar_next_to()
-            .scrollbar_thickness(18.0)
-            .scrollbar_color(Color::Rgba(0.0, 0.0, 0.0, 1.0))
+            .scroll_kids_vertically()
             .set(self.ids.message_box, ui_widgets);
         while let Some(item) = items.next(ui_widgets) {
             item.set(
@@ -121,9 +119,6 @@ impl Chat {
                 ui_widgets,
             )
         }
-        //if let Some(s) = scrollbar {
-        //    s.set(ui_widgets)
-        //}
 
         // Chat Arrow
         if !self.scrolled_to_bottom(ui_widgets) {

From 9a9edb986a3b3b141910c15cc88b397057f5c30e Mon Sep 17 00:00:00 2001
From: Imbris <hank.aa7@gmail.com>
Date: Sat, 13 Apr 2019 10:33:42 -0400
Subject: [PATCH 2/2] use modified version of conrod

Former-commit-id: 6a4697d02e18732dbf9ad679bac761c5a73457fa
---
 voxygen/Cargo.toml    |  5 +++--
 voxygen/src/ui/mod.rs | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml
index d004032b70..d418ec1e55 100644
--- a/voxygen/Cargo.toml
+++ b/voxygen/Cargo.toml
@@ -18,8 +18,9 @@ gfx = "0.17"
 gfx_device_gl = { version = "0.15", optional = true }
 gfx_window_glutin = "0.28"
 glutin = "0.19"
-conrod_core = "0.63"
-conrod_winit = "0.63"
+winit = "0.18"
+conrod_core = { git = "https://gitlab.com/veloren/conrod.git" }
+conrod_winit = { git = "https://gitlab.com/veloren/conrod.git" }
 
 # ECS
 specs = "0.14"
diff --git a/voxygen/src/ui/mod.rs b/voxygen/src/ui/mod.rs
index 2ab107e12b..11ac492547 100644
--- a/voxygen/src/ui/mod.rs
+++ b/voxygen/src/ui/mod.rs
@@ -43,7 +43,23 @@ pub enum UiError {
 pub struct Event(Input);
 impl Event {
     pub fn try_from(event: glutin::Event, window: &glutin::GlWindow) -> Option<Self> {
-        conrod_winit::convert_event(event, window.window()).map(|input| {
+        use conrod_winit::*;
+        use winit;
+        // A wrapper around the winit window that allows us to implement the trait necessary for enabling
+        // the winit <-> conrod conversion functions.
+        struct WindowRef<'a>(&'a winit::Window);
+
+        // Implement the `WinitWindow` trait for `WindowRef` to allow for generating compatible conversion
+        // functions.
+        impl<'a> conrod_winit::WinitWindow for WindowRef<'a> {
+            fn get_inner_size(&self) -> Option<(u32, u32)> {
+                winit::Window::get_inner_size(&self.0).map(Into::into)
+            }
+            fn hidpi_factor(&self) -> f32 {
+                winit::Window::get_hidpi_factor(&self.0) as _
+            }
+        }
+        convert_event!(event, &WindowRef(window.window())).map(|input| {
             Self(input)
         })
     }