From 384d7c7e8f3be4763ee3928efba4a15b208238c4 Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Fri, 26 Aug 2016 23:09:08 +0200
Subject: [PATCH] Fade Defaults, Touch Gesture, Bug fix duplicate project
---
.../playpad/viewcontroller/main/MainViewControllerV2.java | 7 +++++++
.../src/de/tobias/playpad/project/ProjectReference.java | 4 ++--
PlayWallCore/src/de/tobias/playpad/settings/Fade.java | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
index 78b9f8fa..f43badee 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java
@@ -41,6 +41,7 @@ import de.tobias.utils.util.Localization;
import de.tobias.utils.util.OS;
import de.tobias.utils.util.OS.OSType;
import de.tobias.utils.util.Worker;
+import de.tobias.utils.util.win.User32X;
import javafx.application.Platform;
import javafx.beans.property.DoubleProperty;
import javafx.event.EventHandler;
@@ -177,6 +178,12 @@ public class MainViewControllerV2 extends ViewController implements IMainViewCon
public void init() {
padGridPane.getStyleClass().add("pad-grid");
+ // TODO TOUCH
+ if (OS.isWindows() && User32X.isTouchAvailable()) {
+ padGridPane.setOnSwipeLeft(e -> showPage(currentPageShowing - 1));
+ padGridPane.setOnSwipeRight(e -> showPage(currentPageShowing + 1));
+ }
+
notificationPane = new NotificationPane(padGridPane);
notificationPane.getStyleClass().add(NotificationPane.STYLE_CLASS_DARK);
diff --git a/PlayWallCore/src/de/tobias/playpad/project/ProjectReference.java b/PlayWallCore/src/de/tobias/playpad/project/ProjectReference.java
index 44724c67..d69e9cb1 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/ProjectReference.java
+++ b/PlayWallCore/src/de/tobias/playpad/project/ProjectReference.java
@@ -125,8 +125,8 @@ public class ProjectReference implements Displayable {
}
private static void duplicateFiles(ProjectReference currentProject, ProjectReference newProjectReference) throws IOException {
- Path oldPath = ApplicationUtils.getApplication().getPath(PathType.DOCUMENTS, currentProject.getName());
- Path newPath = ApplicationUtils.getApplication().getPath(PathType.DOCUMENTS, newProjectReference.getName());
+ Path oldPath = ApplicationUtils.getApplication().getPath(PathType.DOCUMENTS, currentProject.getFileName());
+ Path newPath = ApplicationUtils.getApplication().getPath(PathType.DOCUMENTS, newProjectReference.getFileName());
Files.copy(oldPath, newPath, StandardCopyOption.COPY_ATTRIBUTES);
}
diff --git a/PlayWallCore/src/de/tobias/playpad/settings/Fade.java b/PlayWallCore/src/de/tobias/playpad/settings/Fade.java
index 73d9ba15..48c9d864 100644
--- a/PlayWallCore/src/de/tobias/playpad/settings/Fade.java
+++ b/PlayWallCore/src/de/tobias/playpad/settings/Fade.java
@@ -18,7 +18,7 @@ public class Fade {
fadeIn = Duration.ZERO;
fadeOut = Duration.ZERO;
- fadeInStart = true;
+ fadeInStart = false;
fadeInPause = true;
fadeOutPause = true;
fadeOutStop = true;
--
GitLab