From c792b9c02c64620b2064fd46eed3d3f7d00a035a Mon Sep 17 00:00:00 2001 From: Michael-Jouanneau Date: Sun, 30 Oct 2016 17:40:23 +0100 Subject: [PATCH] Chnaged things --- src/Launcher/Main.java | 5 +---- src/assets/layout/home.fxml | 2 +- src/assets/layout/modpacks.fxml | 5 ++++- src/assets/style/nav.css | 10 ++++++++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java index df99de4..6333871 100644 --- a/src/Launcher/Main.java +++ b/src/Launcher/Main.java @@ -21,14 +21,13 @@ import javafx.scene.shape.Rectangle; import javafx.stage.Stage; import javafx.stage.StageStyle; import java.net.URL; -import java.util.Set; public class Main extends Application { public static final URL mainLauncher = Main.class.getResource("../assets/layout/main.fxml"); // Launcher body private double xOffset = 0, yOffset = 0; // Offsets for dragging - private Button exit, min, Home_btn, Modpack_btn, Settings_btn; // Define buttons + private Button exit, min, Home_btn, Modpack_btn, Settings_btn; // Define buttons private ImageView icon; private Image appIcon; private Rectangle dragBar; // Draggable top bar @@ -57,7 +56,6 @@ public class Main extends Application { tab = (Pane) root.lookup("#tab"); icon = (ImageView) root.lookup("#icon"); - // Infrastructural navigation exit.setOnMouseClicked(event -> primaryStage.close()); // Closes the program if exit button is clicked min.setOnMouseClicked(event -> primaryStage.setIconified(true)); // Minimizes the program if minimize button is clicked @@ -75,7 +73,6 @@ public class Main extends Application { primaryStage.setY(event.getScreenY() - yOffset); }); - // Set up default layout Tabs.Home.switchTab(tab); icon.setImage(appIcon); diff --git a/src/assets/layout/home.fxml b/src/assets/layout/home.fxml index ee0e362..3332623 100644 --- a/src/assets/layout/home.fxml +++ b/src/assets/layout/home.fxml @@ -1,10 +1,10 @@ + -