Merge remote-tracking branch 'origin/master'

This commit is contained in:
Jannik 2017-09-13 23:58:58 +02:00
commit 9b4bc3ada9
2 changed files with 4 additions and 4 deletions

View File

@ -21,9 +21,9 @@
<classpathentry kind="lib" path="src/libraries/commons-vfs2-2.1.1744488.2.jar"/>
<classpathentry kind="lib" path="src/libraries/flow-8.0.1.jar"/>
<classpathentry kind="lib" path="src/libraries/zip4j-1.3.2.jar"/>
<classpathentry kind="lib" path="src/libraries/jfoenix-1.8.0.jar"/>
<classpathentry kind="lib" path="src/libraries/log4j-api-2.8.2.jar"/>
<classpathentry kind="lib" path="src/libraries/log4j-core-2.8.2.jar"/>
<classpathentry kind="lib" path="src/libraries/jfoenix-1.8.0.jar"/>
<classpathentry kind="lib" path="src/libraries/sqlite-jdbc-3.20.0.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

View File

@ -1203,9 +1203,9 @@ public class MainWindowController {
int xPosHelperMax;
//TODO see issue #main.1
if(System.getProperty("os.name").equals("Linux")){
xPosHelperMax = (int) Math.floor((main.pane.getPrefWidth() - 36) / 217);
xPosHelperMax = (int) Math.floor((mainAnchorPane.getWidth() - 36) / 217);
} else {
xPosHelperMax = (int) Math.floor((main.pane.getPrefWidth() - 24) / 217);
xPosHelperMax = (int) Math.floor((mainAnchorPane.getWidth() - 24) / 217);
}
if(xPosHelper == xPosHelperMax){
xPos = 17;
@ -1215,7 +1215,7 @@ public class MainWindowController {
xPos = xPos + 217;
xPosHelper++;
}
// System.out.println("Breit: " + main.pane.getPrefWidth());
// System.out.println("Breit: " + mainAnchorPane.getWidth());
// System.out.println("xPosHelper: " + xPosHelper);
// System.out.println("yPos: " + yPos);
// System.out.println("xPos: " + xPos);