Skip to content

Fix font loading bug #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 31, 2016
Merged

Fix font loading bug #590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ui/src/main/java/edu/wpi/grip/ui/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");

Expand Down
1 change: 0 additions & 1 deletion ui/src/main/resources/edu/wpi/grip/ui/MainWindow.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
27 changes: 0 additions & 27 deletions ui/src/main/resources/edu/wpi/grip/ui/roboto/Roboto.css
View file
Open in desktop

This file was deleted.