Changed JRE version to 11.0.3. Minor fix to WindowMemory

SkyAphid · May 7, 2019 · 2b75d74 · 2b75d74
1 parent 6bed678
commit 2b75d74
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/ClearDialogue/.classpath b/ClearDialogue/.classpath
@@ -11,8 +11,9 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

diff --git a/ClearDialogueIDE/.classpath b/ClearDialogueIDE/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
+			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>

diff --git a/ClearDialogueIDE/src/nokori/clear_dialogue/ui/ClearDialogueIDECore.java b/ClearDialogueIDE/src/nokori/clear_dialogue/ui/ClearDialogueIDECore.java
@@ -64,6 +64,9 @@ public Window createWindow(WindowManager windowManager) throws GLFWException {
 			if (WindowMemory.maximized) {
 				window.maximize();
 			}
+		} else {
+			WindowMemory.init(window);
+			WindowMemory.save();
 		}
 
 		//Window position memory

diff --git a/ClearDialogueIDE/src/nokori/clear_dialogue/ui/util/WindowMemory.java b/ClearDialogueIDE/src/nokori/clear_dialogue/ui/util/WindowMemory.java
@@ -7,6 +7,8 @@
 import java.io.OutputStream;
 import java.util.Properties;
 
+import nokori.clear.windows.Window;
+
 public class WindowMemory {
 
 	public static final int CURRENT_VERSION = 1;
@@ -15,6 +17,19 @@ public class WindowMemory {
 	public static int x, y, width, height; 
 	public static boolean maximized;
 
+	/**
+	 * Initializes WindowMemory by using the given window as a base.
+	 * 
+	 * @param window
+	 */
+	public static void init(Window window) {
+		x = window.getX();
+		y = window.getY();
+		width = window.getWidth();
+		height = window.getHeight();
+		maximized = window.isMaximized();
+	}
+
 	/**
 	 * Loads the WindowMemory and synchronizes this class with it
 	 */