From 330b69a426a7c84d8c2b29f0c371d71f480f3d36 Mon Sep 17 00:00:00 2001
From: Austin Shalit <austinshalit@gmail.com>
Date: Fri, 27 May 2016 20:02:31 -0700
Subject: [PATCH] Fix font loading bug

---
 ui/src/main/java/edu/wpi/grip/ui/Main.java    |  7 +++++
 .../resources/edu/wpi/grip/ui/MainWindow.fxml |  1 -
 .../edu/wpi/grip/ui/roboto/Roboto.css         | 27 -------------------
 3 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100644 ui/src/main/resources/edu/wpi/grip/ui/roboto/Roboto.css

diff --git a/ui/src/main/java/edu/wpi/grip/ui/Main.java b/ui/src/main/java/edu/wpi/grip/ui/Main.java
index f0cdeee16e..7fe9ebe93b 100644
--- a/ui/src/main/java/edu/wpi/grip/ui/Main.java
+++ b/ui/src/main/java/edu/wpi/grip/ui/Main.java
@@ -23,6 +23,7 @@
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
+import javafx.scene.text.Font;
 import javafx.stage.Stage;
 
 import javax.inject.Inject;
@@ -72,6 +73,12 @@ public void start(Stage stage) throws Exception {
             injector = Guice.createInjector(Modules.override(new GRIPCoreModule(), new GRIPNetworkModule(), new GRIPSourcesHardwareModule()).with(new GRIPUIModule()));
             injector.injectMembers(this);
 
+            System.setProperty("prism.lcdtext", "false");
+            Font.loadFont(this.getClass().getResource("roboto/Roboto-Regular.ttf").openStream(), -1);
+            Font.loadFont(this.getClass().getResource("roboto/Roboto-Bold.ttf").openStream(), -1);
+            Font.loadFont(this.getClass().getResource("roboto/Roboto-Italic.ttf").openStream(), -1);
+            Font.loadFont(this.getClass().getResource("roboto/Roboto-BoldItalic.ttf").openStream(), -1);
+
             root = FXMLLoader.load(Main.class.getResource("MainWindow.fxml"), null, null, injector::getInstance);
             root.setStyle("-fx-font-size: " + DPIUtility.FONT_SIZE + "px");
 
diff --git a/ui/src/main/resources/edu/wpi/grip/ui/MainWindow.fxml b/ui/src/main/resources/edu/wpi/grip/ui/MainWindow.fxml
index c11b8f9ae6..e7e9ecddda 100644
--- a/ui/src/main/resources/edu/wpi/grip/ui/MainWindow.fxml
+++ b/ui/src/main/resources/edu/wpi/grip/ui/MainWindow.fxml
@@ -150,7 +150,6 @@
         <fx:include source="Deploy.fxml" fx:id="deployPane"/>
     </fx:define>
     <stylesheets>
-        <URL value="@roboto/Roboto.css"/>
         <URL value="@GRIP.css"/>
     </stylesheets>
 </VBox>
diff --git a/ui/src/main/resources/edu/wpi/grip/ui/roboto/Roboto.css b/ui/src/main/resources/edu/wpi/grip/ui/roboto/Roboto.css
deleted file mode 100644
index 1911015031..0000000000
--- a/ui/src/main/resources/edu/wpi/grip/ui/roboto/Roboto.css
+++ /dev/null
@@ -1,27 +0,0 @@
-@font-face {
-    font-family: "Roboto";
-    font-weight: normal;
-    font-style: normal;
-    src: url("Roboto-Regular.ttf");
-}
-
-@font-face {
-    font-family: "Roboto";
-    font-weight: bold;
-    font-style: normal;
-    src: url("Roboto-Bold.ttf");
-}
-
-@font-face {
-    font-family: "Roboto";
-    font-weight: normal;
-    font-style: italic;
-    src: url("Roboto-Italic.ttf");
-}
-
-@font-face {
-    font-family: "Roboto";
-    font-weight: bold;
-    font-style: italic;
-    src: url("Roboto-BoldItalic.ttf");
-}
\ No newline at end of file