Merge lp:~yrke/tapaal/arcpathpoint-issues into lp:tapaal

[Kenneth Yrke Jørgensen]

[Jiri Srba (srba)]

Tested and both bugs are fixed.

review: Approve

=== modified file 'src/pipe/gui/graphicElements/Arc.java'
--- src/pipe/gui/graphicElements/Arc.java	2020-07-20 07:20:28 +0000
+++ src/pipe/gui/graphicElements/Arc.java	2020-10-09 09:58:52 +0000
@@ -296,14 +296,14 @@
             y + myPath.getBounds().getY() - COMPONENT_DRAW_OFFSET - zoomGrow
         );
 
-		/*if (!CreateGui.getCurrentTab().isInAnimationMode()) {
-			if (myPath.proximityContains(point) || selected) {
-				// show also if Arc itself selected
-				myPath.showPoints();
-			} else {
-				myPath.hidePoints();
-			}
-		}*/
+		//if (!CreateGui.getCurrentTab().isInAnimationMode()) {
+		//	if (myPath.proximityContains(point) || selected) {
+		//		// show also if Arc itself selected
+		//		myPath.showPoints();
+		//	} else {
+		//		myPath.hidePoints();
+		//	}
+		//}
 		return myPath.contains(point);
 	}
 

=== modified file 'src/pipe/gui/handler/ArcPathPointHandler.java'
--- src/pipe/gui/handler/ArcPathPointHandler.java	2020-06-29 07:43:58 +0000
+++ src/pipe/gui/handler/ArcPathPointHandler.java	2020-10-09 09:58:52 +0000
@@ -64,8 +64,20 @@
 		}
 	}
 
-
-	@Override
+    @Override
+    public void mouseDragged(MouseEvent e) {
+	    //Can't drag endpoint at its broken
+        if (!((ArcPathPoint) myObject).isEndPoint()) {
+            super.mouseDragged(e);
+        }
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent e) {
+        ((ArcPathPoint) myObject).getArcPath().showPoints();
+    }
+
+    @Override
 	public void mouseReleased(MouseEvent e) {
 		((ArcPathPoint) e.getComponent()).setVisibilityLock(false);
 		super.mouseReleased(e);

=== modified file 'tools/launch4j-template.xml'
--- tools/launch4j-template.xml	2020-01-20 08:36:47 +0000
+++ tools/launch4j-template.xml	2020-10-09 09:58:52 +0000
@@ -3,17 +3,17 @@
   <dontWrapJar>true</dontWrapJar>
   <headerType>gui</headerType>
   <jar>%EXEDIR%\lib\tapaal.jar</jar>
-  <outfile>tapaal.exe</outfile>
+  <outfile>C:\Users\kyrke\Downloads\tapaal.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>
   <chdir></chdir>
   <priority>normal</priority>
   <downloadUrl>http://java.com/download</downloadUrl>
-  <supportUrl>http://www.tapaal.net</supportUrl>
+  <supportUrl>https://www.tapaal.net</supportUrl>
   <stayAlive>false</stayAlive>
   <restartOnCrash>false</restartOnCrash>
   <manifest></manifest>
-  <icon></icon>
+  <icon>C:\Users\kyrke\Downloads\tapaal_3_7_eQ9_icon.ico</icon>
   <classPath>
     <mainClass>TAPAAL</mainClass>
     <cp>%EXEDIR%/lib/*</cp>
@@ -22,19 +22,19 @@
     <path></path>
     <bundledJre64Bit>false</bundledJre64Bit>
     <bundledJreAsFallback>false</bundledJreAsFallback>
-    <minVersion>1.6.0</minVersion>
+    <minVersion>11.0.0</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
     <runtimeBits>64/32</runtimeBits>
     <opt>-Dlaunch4j.exedir=&quot;%EXEDIR%&quot;</opt>
   </jre>
   <versionInfo>
-    <fileVersion>3.6.0.0</fileVersion>
-    <txtFileVersion>3.6.0.0</txtFileVersion>
+    <fileVersion>3.7.0.0</fileVersion>
+    <txtFileVersion>3.7.0.0</txtFileVersion>
     <fileDescription>TAPAAL</fileDescription>
     <copyright>TAPAAL Team 2008-2020</copyright>
-    <productVersion>3.6.0.0</productVersion>
-    <txtProductVersion>3.6.0.0</txtProductVersion>
+    <productVersion>3.7.0.0</productVersion>
+    <txtProductVersion>3.7.0.0</txtProductVersion>
     <productName>TAPAAL</productName>
     <companyName></companyName>
     <internalName>tapaal</internalName>