Darker Tree Buttons on dark theme.

Fexcraft · Feb 20, 2020 · b9a9046 · b9a9046
1 parent 60cdb82
commit b9a9046
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/net/fexcraft/app/fmt/FMTB.java b/src/net/fexcraft/app/fmt/FMTB.java
@@ -88,7 +88,7 @@ public class FMTB {
 
 	public static final String deftitle = "[FPS:%s] Fexcraft Modelling Toolbox - %s";
 	public static final String deftitle0 = "Fexcraft Modelling Toolbox - %s";
-	public static final String version = "2.0.0";
+	public static final String version = "2.0.1";
 	public static final String CLID = "587016218196574209";
 	//
 	public static GGR ggr;
@@ -535,7 +535,7 @@ public void run(){
 				String welcome = Translator.translate("dialog.welcome.title");
 				String cversion = Translator.format("dialog.welcome.version", version);
 				String new_title = Translator.format("dialog.welcome.title_new", newver, version);
-				String new_version = Translator.format("dialog.welcome.version_new", "%s >> %s", newver, version);
+				String new_version = Translator.format("dialog.welcome.version_new", newver, version);
 				//
 		        Dialog dialog = new Dialog(bool ? welcome : new_title, 300, 100);
 		        Label label = new Label(bool ? cversion : new_version, 10, 10, 200, 20);

diff --git a/src/net/fexcraft/app/fmt/ui/UserInterfaceUtils.java b/src/net/fexcraft/app/fmt/ui/UserInterfaceUtils.java
@@ -71,7 +71,7 @@ public class UserInterfaceUtils {
 	};
 	public static final Runnable SELECT_TEXTURE = () -> {
 		FileSelector.select(translate("toolbar.textures.select.dialog"), "./", FileSelector.TYPE_PNG, false, file -> {
-			String name = file.getPath(); TextureManager.loadTextureFromFile(name, file); FMTB.MODEL.setTexture(name);
+			if(file == null) return; String name = file.getPath(); TextureManager.loadTextureFromFile(name, file); FMTB.MODEL.setTexture(name);
 			//
 			/*Texture tex = TextureManager.getTexture(name, true); if(tex == null) return;
 			if(tex.getWidth() > FMTB.MODEL.textureX) FMTB.MODEL.textureX = tex.getWidth();

diff --git a/src/net/fexcraft/app/fmt/ui/tree/SubTreeGroup.java b/src/net/fexcraft/app/fmt/ui/tree/SubTreeGroup.java
@@ -8,6 +8,7 @@
 import org.liquidengine.legui.event.MouseClickEvent;
 import org.liquidengine.legui.input.Mouse.MouseButton;
 import org.liquidengine.legui.style.Style.DisplayType;
+import org.liquidengine.legui.style.color.ColorConstants;
 
 import net.fexcraft.app.fmt.FMTB;
 import net.fexcraft.app.fmt.ui.DialogBox;
@@ -16,6 +17,7 @@
 import net.fexcraft.app.fmt.ui.editor.Editors;
 import net.fexcraft.app.fmt.utils.Animator.Animation;
 import net.fexcraft.app.fmt.utils.GGR;
+import net.fexcraft.app.fmt.utils.Settings;
 import net.fexcraft.app.fmt.wrappers.GroupCompound;
 import net.fexcraft.app.fmt.wrappers.PolygonWrapper;
 import net.fexcraft.app.fmt.wrappers.TurboList;
@@ -35,6 +37,7 @@ public SubTreeGroup(TreeBase base){
 		label.getStyle().setFont("roboto-bold");
 		label.getStyle().setPadding(0, 0, 0, 5);
 		label.getStyle().setBorderRadius(0);
+		if(Settings.darktheme()) label.getStyle().setTextColor(ColorConstants.darkGray());
 	}
 
 	public SubTreeGroup(TreeBase base, PolygonWrapper wrapper){

diff --git a/src/net/fexcraft/app/fmt/ui/tree/TreeGroup.java b/src/net/fexcraft/app/fmt/ui/tree/TreeGroup.java
@@ -9,6 +9,7 @@
 import org.liquidengine.legui.component.Panel;
 import org.liquidengine.legui.event.MouseClickEvent;
 import org.liquidengine.legui.input.Mouse.MouseButton;
+import org.liquidengine.legui.style.color.ColorConstants;
 
 import net.fexcraft.app.fmt.FMTB;
 import net.fexcraft.app.fmt.porters.PorterManager;
@@ -18,6 +19,7 @@
 import net.fexcraft.app.fmt.ui.editor.PreviewEditor;
 import net.fexcraft.app.fmt.utils.GGR;
 import net.fexcraft.app.fmt.utils.HelperCollector;
+import net.fexcraft.app.fmt.utils.Settings;
 import net.fexcraft.app.fmt.utils.Settings.Setting;
 import net.fexcraft.app.fmt.wrappers.GroupCompound;
 import net.fexcraft.app.fmt.wrappers.TurboList;
@@ -39,6 +41,7 @@ public TreeGroup(TreeBase base){
 		label.getStyle().setFont("roboto-bold");
 		label.getStyle().setPadding(0, 0, 0, 5);
 		label.getStyle().setBorderRadius(0);
+		if(Settings.darktheme()) label.getStyle().setTextColor(ColorConstants.darkGray());
 	}
 
 	public TreeGroup(TreeBase base, TurboList group, boolean flag){