Commits

shemnon committed ad14633 Merge with conflicts

Merge branch 'jdk8' of ssh://bitbucket.org/shemnon/deckcontrol

Conflicts:
build.gradle
gradle.properties
src/main/java/com/github/shemnon/deckcontrol/skin/ShiftDeckSkin.java
src/test/java/com/github/shemnon/deckcontrol/DemoOne.java

Comments (0)

Files changed (3)

 }
 
 dependencies {
-    compile files("${System.properties['java.home']}/lib/jfxrt.jar")
-    compile files("${System.properties['java.home']}/lib/ext/jfxrt.jar")
     testCompile group: 'junit', name: 'junit', version: '4.+'
 }
 

gradle.properties

 bintray_username=shemnon
 #bintray_api_key = 1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef
 bintray_repo=javafx
-bintray_package=DeckControl
+bintray_package=DeckControl
+
+sourceCompatibility = 1.7
+version=0.0

src/main/java/com/github/shemnon/deckcontrol/skin/ShiftDeckSkin.java

                 // slide last slide to right
                 TranslateTransition translate = new TranslateTransition(Duration.seconds(1), oldNode);
                 translate.setFromX(0);
-                translate.setToX(-deck.getWidth());
+                translate.setToX(deck.getWidth());
                 translate.setOnFinished(hideOldNode);
 
                 transition.getChildren().add(translate);
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.