Major update (Stable)
- Update libRefTools library - Completely rewrote Tabs class - Tabs class now uses ShiftingList to ensure that unused resources get recycled - Loaded resources can now be unloaded at will - Loaded resources can now be reloaded at will - Previously loaded, non-recycled resources are loaded from ShiftingList - Added implicit sub-tab support by requesting a parent to place tab in - Added blank settings sub-tab layout asset files - Fixed some continuity for variables in Main class - Made css style handling changes to allow for dynamic color change and selection of tabs - Id's are no longer used to define style of tabs. That is done by styleClass now - StyleClasses are now updated from Main when a tab is selected - Selected tabs use regular tab "hover" color to signify selection - Selected tabs that are being hovered over are even darker - Added "local layout" references inside onMouseClicked listeners to continuity - Made updating currently selected tab easier by moving all the code to a method
This commit is contained in:
parent
4facd84106
commit
33677806ef
Binary file not shown.
@ -13,16 +13,19 @@ package Launcher;
|
||||
import com.tofvesson.reflection.SafeReflection;
|
||||
import javafx.application.Application;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.Scene;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.*;
|
||||
import javafx.scene.image.Image;
|
||||
import javafx.scene.image.ImageView;
|
||||
import javafx.scene.layout.Pane;
|
||||
import javafx.scene.shape.Rectangle;
|
||||
import javafx.stage.Stage;
|
||||
import javafx.stage.StageStyle;
|
||||
|
||||
import java.net.URL;
|
||||
|
||||
import com.tofvesson.async.*;
|
||||
|
||||
public class Main extends Application {
|
||||
@ -30,13 +33,13 @@ 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, Instance_btn, Settings_General_btn, Settings_Minecraft_btn; // Define buttons
|
||||
private Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn; // Define buttons
|
||||
private ImageView icon;
|
||||
private TextField Search_modpacks;
|
||||
private Image appIcon;
|
||||
private Rectangle dragBar; // Draggable top bar
|
||||
private Pane root, tab;
|
||||
private Tabs activeTab = Tabs.Home;
|
||||
private Node activeTab, settings_activeTab;
|
||||
Async stringUpdater;
|
||||
|
||||
@Override
|
||||
@ -61,8 +64,6 @@ public class Main extends Application {
|
||||
Modpack_btn = (Button) root.lookup("#Modpacks-btn");
|
||||
Settings_btn = (Button) root.lookup("#Settings-btn");
|
||||
Instance_btn = (Button) root.lookup("#Instance-btn");
|
||||
Settings_General_btn = (Button) root.lookup("Settings-Gen-btn");
|
||||
Settings_Minecraft_btn = (Button) root.lookup("Settings-Mine-btn");
|
||||
|
||||
tab = (Pane) root.lookup("#tab");
|
||||
|
||||
@ -75,32 +76,57 @@ public class Main extends Application {
|
||||
min.setOnMouseClicked(event -> primaryStage.setIconified(true)); // Minimizes the program if minimize button is clicked
|
||||
|
||||
Home_btn.setOnMouseClicked(event ->{
|
||||
if(activeTab!=Tabs.Home){
|
||||
(activeTab=Tabs.Home).switchTab(tab);
|
||||
if(!activeTab.equals(Home_btn)){
|
||||
updateTabSelection(Home_btn);
|
||||
Tabs.switchTab("home", tab);
|
||||
}
|
||||
}); // Sets the active tab to the home tab unless it's already active
|
||||
|
||||
Modpack_btn.setOnMouseClicked(event ->{
|
||||
if(activeTab!=Tabs.Modpacks){
|
||||
if(!activeTab.equals(Modpack_btn)){
|
||||
updateTabSelection(Modpack_btn);
|
||||
Tabs.switchTab("modpacks", tab);
|
||||
if(stringUpdater!=null && stringUpdater.isAlive()) stringUpdater.cancel();
|
||||
(activeTab=Tabs.Modpacks).switchTab(tab); // Sets the active tab to the modpacks tab unless it's already active
|
||||
|
||||
stringUpdater = new Async(SafeReflection.getFirstMethod(Main.class, "detectStringUpdate"), Tabs.Modpacks.loaded.lookup("#search-modpacks"));
|
||||
stringUpdater = new Async(SafeReflection.getFirstMethod(Main.class, "detectStringUpdate"), Tabs.load("settings").lookup("#search-modpacks"));
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
Instance_btn.setOnMouseClicked(event -> {
|
||||
if(activeTab!=Tabs.Instance){
|
||||
(activeTab = Tabs.Instance).switchTab(tab);
|
||||
if(!activeTab.equals(Instance_btn)){
|
||||
updateTabSelection(Instance_btn);
|
||||
Tabs.switchTab("instance", tab);
|
||||
DialogPane d = new DialogPane();
|
||||
Tabs.load("instance").lookup("#Launch-VM").setOnMouseClicked(event1 -> {
|
||||
Dialog d1 = new Dialog<>();
|
||||
DialogPane d2 = d1.getDialogPane();
|
||||
d2.setContent(new TextArea("Hello"));
|
||||
d1.show();
|
||||
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
Settings_btn.setOnMouseClicked(event ->{
|
||||
if(activeTab!=Tabs.Settings){
|
||||
(activeTab=Tabs.Settings).switchTab(tab); // Sets the active tab to the settings tab unless it's already active
|
||||
if(!activeTab.equals(Settings_btn)){
|
||||
updateTabSelection(Settings_btn);
|
||||
Node n = Tabs.switchTab("settings", tab); // Sets the active tab to the settings tab unless it's already active
|
||||
|
||||
(settings_activeTab=n.lookup("#Settings-Gen-btn")).setOnMouseClicked(event1 -> {
|
||||
// Generic Settings Sub-tab
|
||||
if(!settings_activeTab.equals(n.lookup("#Settings-Gen-btn"))){
|
||||
updateSettingsTabSelection(n.lookup("#Settings-Gen-btn"));
|
||||
Node genericLayout = Tabs.switchTab("settings_generic", (Pane) n.lookup("#Settings-Pane"));
|
||||
}
|
||||
});
|
||||
|
||||
n.lookup("#Settings-Mine-btn").setOnMouseClicked(event1 -> {
|
||||
// Minecraft Settings Sub-tab
|
||||
if(!settings_activeTab.equals(n.lookup("#Settings-Mine-btn"))){
|
||||
updateSettingsTabSelection(n.lookup("#Settings-Mine-btn"));
|
||||
Node minecraftLayout = Tabs.switchTab("settings_minecraft", (Pane) n.lookup("#Settings-Pane"));
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
@ -115,7 +141,8 @@ public class Main extends Application {
|
||||
});
|
||||
|
||||
// Set up default layout
|
||||
Tabs.Home.switchTab(tab);
|
||||
activeTab = Home_btn; // Update selected tab
|
||||
Tabs.switchTab("home", tab);
|
||||
icon.setImage(appIcon);
|
||||
}
|
||||
|
||||
@ -123,9 +150,29 @@ public class Main extends Application {
|
||||
launch(args);
|
||||
}
|
||||
|
||||
/**
|
||||
* Search for packs with an 80% match compared to detected string.
|
||||
* @param toRead TextField to read from.
|
||||
*/
|
||||
public static void detectStringUpdate(TextField toRead){
|
||||
String s = "";
|
||||
while(true) if(!s.equals(toRead.getText())) System.out.println(s = toRead.getText());
|
||||
|
||||
}
|
||||
|
||||
void updateTabSelection(Node newTab){
|
||||
activeTab.getStyleClass().remove("selected");
|
||||
activeTab.getStyleClass().add("tab");
|
||||
activeTab = newTab;
|
||||
activeTab.getStyleClass().remove("tab");
|
||||
activeTab.getStyleClass().add("selected");
|
||||
}
|
||||
|
||||
void updateSettingsTabSelection(Node newTab){
|
||||
settings_activeTab.getStyleClass().remove("selected");
|
||||
settings_activeTab.getStyleClass().add("tab");
|
||||
settings_activeTab = newTab;
|
||||
settings_activeTab.getStyleClass().remove("tab");
|
||||
settings_activeTab.getStyleClass().add("selected");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,37 +1,73 @@
|
||||
package Launcher;
|
||||
|
||||
import com.tofvesson.collections.ShiftingList;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import javafx.scene.Parent;
|
||||
import javafx.scene.Node;
|
||||
import javafx.scene.layout.Pane;
|
||||
import javafx.util.Pair;
|
||||
import java.io.IOException;
|
||||
import java.net.URL;
|
||||
|
||||
public enum Tabs {
|
||||
@SuppressWarnings("unused")
|
||||
public class Tabs {
|
||||
|
||||
Modpacks(Tabs.class.getResource("../assets/layout/modpacks.fxml")),
|
||||
Home(Tabs.class.getResource("../assets/layout/home.fxml")),
|
||||
Settings(Tabs.class.getResource("../assets/layout/settings.fxml")),
|
||||
Instance(Tabs.class.getResource("../assets/layout/instance.fxml"));
|
||||
private static final ShiftingList<Pair<URL, Node>> loaded = new ShiftingList<>(35); // Memory-efficient list of loaded files
|
||||
|
||||
/**
|
||||
* Url referencing xml.
|
||||
* Loads layout from file in layout assets folder. If layout is already loaded,
|
||||
* Tabs won't bother with reloading and will instead return the cached version.
|
||||
* @param fileName Name of fxml file to load. (Must be located in /assets/layout/ folder or name must define name subfolder in layouts folder)
|
||||
* @return Generified object referring to loaded resource.
|
||||
*/
|
||||
public final URL url;
|
||||
|
||||
/**
|
||||
* Loaded layout
|
||||
*/
|
||||
public final Parent loaded;
|
||||
|
||||
Tabs(URL url){
|
||||
this.url = url;
|
||||
Parent p = null;
|
||||
try { p = FXMLLoader.load(url); } catch (IOException e) { e.printStackTrace(); }
|
||||
loaded = p;
|
||||
public static Node load(String fileName){
|
||||
if(!fileName.endsWith(".fxml")) fileName+=".fxml";
|
||||
URL file = Main.class.getResource("../assets/layout/"+fileName);
|
||||
try {
|
||||
final boolean[] b = {false};
|
||||
loaded.stream().filter(p -> p.getKey().equals(file)).forEach(p->b[0]=true);
|
||||
if(!b[0]) loaded.add(new Pair<>(file, FXMLLoader.load(file))); // Load file if it isn't already loaded
|
||||
final Node[] p1 = new Node[]{new Pane()};
|
||||
loaded.stream().filter(p->p.getKey().equals(file)).forEach(p->p1[0]=p.getValue());
|
||||
return p1[0];
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
return new Pane(); // Returns empty layout if all else fails
|
||||
}
|
||||
}
|
||||
|
||||
public void switchTab(Pane holder){
|
||||
holder.getChildren().clear();
|
||||
holder.getChildren().add(loaded);
|
||||
/**
|
||||
* Switches the currently loaded tab in holder pane. Removes current children from holder and adds new tab instead.
|
||||
* If holder already contains layout, method simply returns the loaded resource.
|
||||
* @param newTabName Name of file containing the new tab data.
|
||||
* @param holder Pane where tab should be loaded to.
|
||||
* @return Generified object referring to loaded resource.
|
||||
*/
|
||||
public static Node switchTab(String newTabName, Pane holder){
|
||||
Node n = load(newTabName);
|
||||
if(!holder.getChildren().contains(n)) {
|
||||
holder.getChildren().clear();
|
||||
holder.getChildren().add(n);
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
/**
|
||||
* Forces unloading of resource to free up resources and/or clear data.
|
||||
* @param fileName Name of resource to unload.
|
||||
*/
|
||||
public static void unloadTab(String fileName){
|
||||
if(!fileName.endsWith(".fxml")) fileName+=".fxml";
|
||||
URL file = Main.class.getResource("../assets/layout/"+fileName);
|
||||
loaded.stream().filter(p->p.getKey().equals(file)).forEach(loaded::remove);
|
||||
}
|
||||
|
||||
/**
|
||||
* Forces unloading and the subsequent loading of a layout resource.
|
||||
* @param fileName Name of resource to reload.
|
||||
* @return Newly loaded layout.
|
||||
*/
|
||||
public static Node reloadTab(String fileName){
|
||||
unloadTab(fileName);
|
||||
return load(fileName);
|
||||
}
|
||||
}
|
||||
|
||||
6
src/assets/layout/instance_userinfo.fxml
Normal file
6
src/assets/layout/instance_userinfo.fxml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.scene.layout.Pane?>
|
||||
|
||||
|
||||
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1" />
|
||||
@ -7,7 +7,7 @@
|
||||
<?import javafx.scene.shape.Rectangle?>
|
||||
<?import javafx.scene.text.Font?>
|
||||
|
||||
<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1">
|
||||
<children>
|
||||
<Rectangle id="rectangle" arcHeight="5.0" arcWidth="5.0" fill="white" height="50.0" strokeType="INSIDE" width="900.0" />
|
||||
<Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../style/nav.css" text="X" textFill="WHITE" />
|
||||
@ -19,22 +19,22 @@
|
||||
</font>
|
||||
</Label>
|
||||
<Rectangle id="nav" arcHeight="5.0" arcWidth="5.0" fill="#101e38" height="450.0" layoutY="50.0" stroke="TRANSPARENT" strokeType="INSIDE" width="150.0" />
|
||||
<Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Home" textFill="WHITE" textOverrun="CLIP">
|
||||
<Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="selected" text="Home" textFill="WHITE" textOverrun="CLIP">
|
||||
<font>
|
||||
<Font name="Centaur" size="16.0" />
|
||||
</font>
|
||||
</Button>
|
||||
<Button id="Modpacks-btn" layoutY="90.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Modpack" textFill="WHITE" textOverrun="CLIP">
|
||||
<Button id="Modpacks-btn" layoutY="90.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="tab" text="Modpack" textAlignment="CENTER" textFill="WHITE" textOverrun="CLIP">
|
||||
<font>
|
||||
<Font name="Centaur" size="16.0" />
|
||||
</font>
|
||||
</Button>
|
||||
<Button id="Instance-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Instances" textFill="WHITE" textOverrun="CLIP">
|
||||
<Button id="Instance-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="tab" text="Instances" textFill="WHITE" textOverrun="CLIP">
|
||||
<font>
|
||||
<Font name="Centaur" size="16.0" />
|
||||
</font>
|
||||
</Button>
|
||||
<Button id="Settings-btn" layoutY="170.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Settings" textFill="WHITE" textOverrun="CLIP">
|
||||
<Button id="Settings-btn" layoutY="170.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" styleClass="tab" text="Settings" textFill="WHITE" textOverrun="CLIP">
|
||||
<font>
|
||||
<Font name="Centaur" size="16.0" />
|
||||
</font>
|
||||
|
||||
@ -15,11 +15,12 @@
|
||||
</font>
|
||||
</Label>
|
||||
<Rectangle arcHeight="5.0" arcWidth="5.0" fill="#0d0d39" height="40.0" layoutY="50.0" width="750.0" />
|
||||
<Button id="Settings-Gen-btn" layoutX="0.0" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" text="General" textFill="WHITE" />
|
||||
<Button id="Settings-Mine-btn" layoutX="100.0" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" text="Minecraft" textFill="WHITE">
|
||||
<Button styleClass="selected" id="Settings-Gen-btn" layoutX="0.0" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" text="General" textFill="WHITE" />
|
||||
<Button styleClass="tab" id="Settings-Mine-btn" layoutX="100.0" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="100.0" text="Minecraft" textFill="WHITE">
|
||||
<font>
|
||||
<Font name="Candara" size="12.0" />
|
||||
</font></Button>
|
||||
</font>
|
||||
</Button>
|
||||
<Pane id="Settings-Pane" layoutY="90.0" prefHeight="360.0" prefWidth="750.0" />
|
||||
</children>
|
||||
</Pane>
|
||||
|
||||
6
src/assets/layout/settings_generic.fxml
Normal file
6
src/assets/layout/settings_generic.fxml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.scene.layout.Pane?>
|
||||
|
||||
|
||||
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1" />
|
||||
6
src/assets/layout/settings_minecraft.fxml
Normal file
6
src/assets/layout/settings_minecraft.fxml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.scene.layout.Pane?>
|
||||
|
||||
|
||||
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.92" xmlns:fx="http://javafx.com/fxml/1" />
|
||||
@ -13,15 +13,27 @@
|
||||
#min:hover, #exit:hover{
|
||||
-fx-background-color: #bf0000;
|
||||
}
|
||||
#Home-btn, #Modpacks-btn, #Settings-btn, #Instance-btn, #Settings-Gen-btn, #Settings-Mine-btn{
|
||||
-fx-background-color: rgba(0, 0, 0, 0);
|
||||
}
|
||||
#Home-btn:hover, #Modpacks-btn:hover, #Settings-btn:hover, #Instance-btn:hover, #Settings-Gen-btn:hover, #Settings-Mine-btn:hover {
|
||||
-fx-background-color: #0c182d;
|
||||
-fx-background-radius: 0em;
|
||||
}
|
||||
#search-modpacks {
|
||||
-fx-text-inner-color: white;
|
||||
-fx-background-color: rgba(0, 0, 0, 0.5);
|
||||
-fx-padding: 10px;
|
||||
}
|
||||
|
||||
.tab {
|
||||
-fx-background-color: rgba(0, 0, 0, 0);
|
||||
-fx-background-radius: 0em;
|
||||
}
|
||||
|
||||
.tab:hover{
|
||||
-fx-background-color: #0c182d;
|
||||
|
||||
}
|
||||
|
||||
.selected {
|
||||
-fx-background-color: #0c182d;
|
||||
-fx-background-radius: 0em;
|
||||
}
|
||||
|
||||
.selected:hover {
|
||||
-fx-background-color: #050b14;
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user