From dd32f7919fdd1ed8af936e4770661189bef0658b Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Thu, 8 Dec 2016 23:23:48 +0100
Subject: [PATCH] Fixed #10
---
.../roadgame/ui/PossibleTilesController.class | Bin 3150 -> 3609 bytes
.../roadgame/ui/PossibleTilesGUI.fxml | 31 +++++++++++-------
.../ui/SelectTilePackController$1.class | Bin 3323 -> 3412 bytes
.../ui/SelectTilePackController$2.class | Bin 1892 -> 1892 bytes
.../ui/SelectTilePackController.class | Bin 4986 -> 4986 bytes
.../roadgame/ui/PossibleTilesController.java | 15 ++++++---
.../roadgame/ui/PossibleTilesGUI.fxml | 31 +++++++++++-------
.../roadgame/ui/SelectTilePackController.java | 4 ++-
8 files changed, 53 insertions(+), 28 deletions(-)
diff --git a/bin/de/deadlocker8/roadgame/ui/PossibleTilesController.class b/bin/de/deadlocker8/roadgame/ui/PossibleTilesController.class
index b731ce80406763fbbf987bec49d038ff13f35890..72a8a4499d27497d121956ff305a3e045b7bad6e 100644
GIT binary patch
delta 1805
zcmX>nF;hn1)W2Q(7#J8#7>=+rFflS1O>Sh7n5bdI$5otMl%JCmkeHXs$e=jckyDH-
z7%nog+C-BhEhoPmA}!~Wl~|UTR-s><oSK)apOaXbUs|H?29=+<CY?=~hk>6#V6r6R
z-Fj&r23`g}P6kE>Ssn&X1}-)SO9n9DVo+pIW@k`hWRSsU91nvEgDN8fdvR(>SbAas
zBLj<ui)I)|vpNrh229E$J+S~Jrp3dc&7i}`AXre8niig!Qc|B0P?TSgT2xZW$e^L2
z33GW;YGPioegRZU-zC2^DJK=C(i-GiJst*D1~x7R0|p~@217;$c@#$`=jW9a<>%-l
z!ia~#n8AdRfww#}r3A^&dIOx62BjvZ_~+$RqFK(xV8&p<&S1{SpaQiLuVZ-_EE%jA
z8Ca4s^HLZY)HP6jSQeR>Q<|#ppH!S$RF;^OlNtu%TSEfShKIox6j(x_!174VOwTBR
z1p&z4_B;#@ATRM{ph-C~xUe%gPd?A2&+N+JHkpxGRo;Wai=DxfkwFmTWc|{T%p84>
z#NrI!!~z}$Zw8;quFUe%ehdNZ4E~G^ya+YHsU<uNfeb;D>zUOQLKwo>8A2Hugb?zc
zC8<S;CHX}>4B-qBlaDehutYI3s7-EUQPX2*h+$-q04YUJh#pS)6<iF_48oiY@eGOV
z3<-=3!jm^L2@CQtBrzm2GO#(j`h~a#F*1lw-oPZv1yY*I!;r?1K6x&a78^T5CL@E=
z<VF@HJ}!m~hHOwu&S7NG)|ec~Avt+I2R|<;@bVZ6*ctK}8B{^}XYyGVe&#}kqRIDJ
z^4ZE5D%csyCx@^qiBy78CwFmbiEm;BC@p5NGgMFRVwGp9Wn>Va9LOea%)wC4$iP^^
z#Zbf02(qY&kwFv^gZep%dFlGWB}JKe>EP({U})iCXk}=d{GHX1qlTe_hoO_9Yq9~G
zHAf9Y4-Z2xL*L|LHWjuihDHvCiIeBD>B&|xOy*&j!qCLXz)_r95?oT5lM3?dG#-ZO
z3^OLbV6)(y#W07RVKykg|6x;P<zbl1FmJLyy8`2a$p!3^a$F4a85V(DwV08CUBku2
z1)T4q8J6-eEMr(cc>}vWuOh=VZiWzsRXhx<8P;t6!(PnDxOZ{^ryR!~h66kd2N?t=
zPvf*@WSM-0Q@@^(ft`VYfsKKYfrEj8feBP9FfcGMGcbaR3I;|7K?Vi}eFjDbMg|53
zR;}#}LL0%#M4*}&7z7za85kINAPN}77{nPE7#JBO7$hN@8E-OhGjK65Fnrb0-pU}Q
zwS_@Ogh6f_g93zAFSm_B4aD5WpsBTmL3bO2{x$|vh=4Ujz-}9ZsqQug$88MmI~jZ#
z8LU{BGc1&3-N_Kl$Z&um(u!p_Lv-YJhFB{$Nw!T4aoZSDb~9u|O0sNc$g*PBkz{9P
zX5Pk-YsDeSA;M6+jiGcmLsjH%hMGvBy6p@N^&pcaS++4WZ)0fR#?ZZ;q2G#Al2d5H
zHik)(Y}**7N^<OEn90Nt4&iV@Ih?y0=121J@rf|VZD&}xgJB88#VaJ)pbA)bGOT1|
znDsvz6kN;<py2Xj5N2RtkY-?IkY(U!kYkW!P+-uiXHaCYW>98`U{Ga9WKd(sWYAzJ
zVbEl#XV7A3XV76-!Jx~qo<W~s4}$^2Nd`lP+YCkwuNagWzA%`8!##$96BM@4aA#on
z3XVWfWPN2=%dn1t2`sywVFLp*Lj=PlhK&rH7+4q*89Es@Gi+gCW2i4-C}Y^lu#JJ8
zp`Ia|VLQVP1`dW53{DI?8Fn#nGVEqxV31*8`p@9Qz{bwN$j-2bogt5%!HI#LA%ub9
zH^W>8MuvS10+6U?FoUKO4y`Q=Qrj5zgZ$0}_B$8YAr=hm43=PLLy`*zgBTw)y&M9k
Gs>1-ZJ*Qy+
delta 1259
zcmbO!b54Tm)W2Q(7#J8#7}ieY3SeR>n{3Y|%@XF6Uoo-6Wa5hyHbEW+UIxC&L5z1*
zBzYLP8F)Au7#XB_7+4wD*c?<Cz<`TEo<WhFL4lD$V)6nm5mk_O9tI@_Wkv?B;?$Dh
zg2d#^ymUqe77Z88Fir+l26c7@waEpn5?mS#nv4uwA^rjJllxc|IOG|$c^GsUbSH0P
z)#B!2&}T4YXE0!7(3&V9F<F5{gxQF}c(OT*s=O(KIXi<HBZFX8Vp*boX-Q^|zDHtl
zhHqj44}%4R<>YD>d1-3~TXqH;Mh0Gln&8wD9tJxG`^j5b)Yu#uoY@(iCO>2mXLez5
zo&1|cfyJGXK@DV;J{un!JA)_GJCoyC*%Un(1VIk>;bHIvIhoDb)i1;~h>O94L7SZ+
zfRRB7qK}K0i@~2E2oz?)j11b7C$gysg;W-#T5E=JF@!RNvonM-GN?`zkmh&J&nqd)
z&&f$G;$etjh@4!?md_c>5YNsK$H*W%c>$NK7!N}NC<M8SQ%igkE5b8VN;23Pk|ry#
z%QL1-c3_v`Ph(_Ytl(luX2<~9mpM6`U5dk$A)ALGhaq=zFS{W}GDAKOLjgnK<YVmC
z9LWsDJPaiarIR^1RM-+3GB_A2CL43;$tE&X@i0^~WHK^vfa0p8GA9+}ty&(2I)?hm
zbsQFKjSS7~3{8{waHui2Ftkp7%Avs0&d4A(IgwLLoz1}#oCFxS7}^-RLGI{bWMJ2D
zadB}0dD(-ZkB6b3VZvlvPJ3Q?hFWe0M~2Bf3{x1UZtmnPW@KD8`7f6o$5MusJPfNC
z_$DiJ+cGjwPUP0FXJBAvU<9Q+21W*c1_lOw21W)(1_lOJt?di~8yOfFm>7f@7#P^V
zf&vV}3=9lBU^Xj*2!kjC0|O(27=t)OGvj&&ZU!y}28PR8+FKbUw6-uvi7?1)V~_)}
zHZiDdW6;vw#-O*2!DJ_c6(fTc>vD$rg_5j085|fH4luY`vFv8>h}_QLWyL1Rwu!-e
z8-w3&2LDJ&mhB9IR_r>G?99x}+ZaNuI3zhl7^1c@#O!8BjNHwT94VB#ogp1$vLwqk
zhOBK2dD|F@wlkDjaY}Lum2YFHlw{k+P$S8)lc9l$AsoWtgmUURcQdp_^6~MBFm!BZ
z=-R>13v%l=hKZ7FP!+5@8746@%=#a_kpUD|pulir5M*FrkYr$GkY?a#kYSKykYg}o
zP++iUP-JjtP-X~XP+^E=P-RGEP-kdk&|v6g&|;Xypv|zHL5E={gD%4f204aH4EmtJ
ztY?T}-~@#jG&C6)E`#zuID{`VOk<eNzyy|^!7!77nZb-<62mNp*$gZU_6(g2a~S3_
zurUNNlrhX>n9sn@5X+Fwuz+D90|!GJgA>CdhQ$n=3`-ao7-Sfj{xfJXu(2~RvNJ4Y
zX9#6y&}U$0aAaWk&EP+mfstW310N&;8O)%u&!M%2L1G)j3Xq>634jai5Mu^*1{09G
Rp^1P4>TE`a)!?ME1^{!|?x_F(
diff --git a/bin/de/deadlocker8/roadgame/ui/PossibleTilesGUI.fxml b/bin/de/deadlocker8/roadgame/ui/PossibleTilesGUI.fxml
index a73dc92..40fa33c 100644
--- a/bin/de/deadlocker8/roadgame/ui/PossibleTilesGUI.fxml
+++ b/bin/de/deadlocker8/roadgame/ui/PossibleTilesGUI.fxml
@@ -1,22 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.FlowPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-<AnchorPane prefHeight="600.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.roadgame.ui.PossibleTilesController">
+<AnchorPane prefHeight="500.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.roadgame.ui.PossibleTilesController">
<children>
- <ScrollPane layoutX="14.0" layoutY="14.0" AnchorPane.bottomAnchor="56.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
- <content>
- <VBox fx:id="vbox" prefHeight="530.0" prefWidth="272.0" />
- </content>
- </ScrollPane>
- <Button fx:id="buttonBack" layoutX="119.0" layoutY="556.0" mnemonicParsing="false" onAction="#back" prefHeight="30.0" prefWidth="63.0" text="Back" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="119.0" AnchorPane.rightAnchor="118.0">
- <font>
- <Font name="System Bold" size="14.0" />
- </font>
- </Button>
+ <VBox alignment="TOP_CENTER" layoutX="14.0" layoutY="14.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
+ <children>
+ <ScrollPane fx:id="scrollPane" VBox.vgrow="ALWAYS">
+ <content>
+ <FlowPane fx:id="flowPane" prefHeight="418.0" prefWidth="565.0" />
+ </content>
+ </ScrollPane>
+ <Button fx:id="buttonBack" mnemonicParsing="false" onAction="#back" prefHeight="30.0" prefWidth="70.0" text="Back">
+ <font>
+ <Font name="System Bold" size="14.0" />
+ </font>
+ <VBox.margin>
+ <Insets top="14.0" />
+ </VBox.margin>
+ </Button>
+ </children>
+ </VBox>
</children>
</AnchorPane>
diff --git a/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$1.class b/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$1.class
index bedf680ac2b3bbcb2f66d1cf496c5d87a9bff893..690ca06b52dad6cab9a94d2386f4fcf4aa47c1d9 100644
GIT binary patch
delta 686
zcmew@c}0rr)W2Q(7#J8#7}jm%I>qYE=1|E123!nw42e7pNes!14BW-3CBB(?;h8BV
z8H@}p8ZMe)An8;dhBS~g4@BA{H8VY<1SFBc!;s04HTfQ^DQ6Bt9y>!WBZK1P_pFMn
zJPi2^1(TiFl-P=R7>XH6CTFopNtW?2lrvZ}GVrFSmN@6<l@#UY<fIm{GgMBV%Vy3|
z!BEY^P{U9=`3_r!PCXAp1A_u1150s6emN&Y6GIC-Lo*`-e@=dSdTNorPky>jYFTOy
z4?`<M+vEmzIq43DE_Q}aMh0GliuBYX9)@m)p2<7eoj5ue`gj=n8753-<}hTOwAqwH
zmQisbBZEX%Vp(EZg??&TYF>%HV{%Dmex56c&BegTuy}GY=RB5Gj10yT1&moij$5<Y
zmy45;Gm?RYfsKKIVaDWmZqH;9hPZ7E36d;eIz^IY8$-I*76yr(4B1Q!;gT#Y+ZYOU
zwlS0*V5qQSm1LD<(b~cwrL~1YW*b8lNO9eA20q_S42?QF7}|F*^loHeWME+EWawd-
z$iU2?$iTqh#UM2KH@9NFKSK~hI72W)8bb&}4nrtIDMJ`T3qv?VCqpDd4?`3~FGCE&
zbcT2aB?blt4+eIS`xulNRKSrugJCkm6b42HL52#3sSMK?m>47(3K*s{%wS+<P+~}D
zn90D!z`{_<Ai^+<VKxIRLoWjt!yJaW3``937#J8h8JNB^Wc08zOym-9WKd<8&%nqa
z%)r2)$-u<G1d`X%KESYG8^fZF3=9lRU`Mloy}<}}3`hwJ!xFIEQif$<dO5=i1_lNe
VhLsGf8P+l|Fo41v<Z%WD1^^S!mcsx5
delta 593
zcmca2^;=Tl)W2Q(7#J8#7?!d#FflTiPJYNHJ^3z^)JE5SRxU0EJBD~3h6IMh$?|Nb
zoXHHS><lT442qKt*c4fL7}6NhCpWVxv1RfwWHDq<Ud<*YnajhF$6(FKz?+_0;+&sX
zQk0*QlUl^iP%!x(n>j~5LlF-{F+<5@S@sH@G9HF<1_ee2mg0>3a!!UyhH7?(Dn<tW
zoc#3k)FOSK{B)nxveX<Nh8l+2$p_ixr0W?P*%=xb8F&#Y(o>6g7@8QGC;wu1;;3h6
z<zZ-JXrJuDVaV9Ixr{@WQE>(%gG5$hSz=m+erj22UWvYAa!F=>o-2sW#lXlgYw{M(
zc`OSV8H}MGmtY0CaPj6oE>1>HM+O!KHU<WUj>!wSJ%hI~#A$6|kl4wP#KaIT$-=yi
zAwy>yL(Tz)d@EK-R!J7EEeujxTNq@vF%(L&Y-1>0&cNrpiJ?Mg2SeQshL(*Cj0_A6
zl?*iu9SqD2iVO@4P7DH*eRve>!x(}XVi<xMQW-)RN*F>JDjC8VY8WCIY8j#!+8JUQ
zlo%KoJQ&zP?qE=6P+<Up4u&p<ZU#mML52*59)?~9CI(4{1cp9_eg<X+C5CW@2@G5e
zEDWg(A`BB5CNZ!w)G}}}OlFwEz{D_>fq{XOf$2L#4Ld^zmw+RKv?{|i21W*91_lOA
z1||k3ki3@m0fy<@7-ml9=atc%&A`CG#4v|pE|{LjFrR^efrViK!y<+y3=9mQPz3pm
Hfq?-4CM1Nz
diff --git a/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$2.class b/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$2.class
index c1e46d7ede0e2d0c9a75c6e25144c146a32a401f..86b2a5605f9b12afb3e9ab47b5b0898dde48a07b 100644
GIT binary patch
delta 31
mcmaFD_k?dlIU8f{<O;TM-XaEGh7tw|hEfK3hVsdG*g625DG3Mw
delta 31
mcmaFD_k?dlIU8g4<O;TM-U0?*h9U+DhGGVJhSJG**g624qX_;0
diff --git a/bin/de/deadlocker8/roadgame/ui/SelectTilePackController.class b/bin/de/deadlocker8/roadgame/ui/SelectTilePackController.class
index 75590e6be117f1f67f1ca6acff6be800c19e5561..6467685473a262965fdbfe36eff88916ae202b39 100644
GIT binary patch
delta 71
zcmeyR_DgMpnUG-;!*7OUMizz?MnQ&DMoES=Mm2_XMq`EyMpuSRMjwVO#%P9Y#w><h
b#%cx&##V-^$>~D3SnC+r8R{py37Y@_Wq1&L
delta 71
zcmeyR_DgMpnUG-u!*7N}Miz!7MnQ&TMoESgMm2_1Mq`FFMpuS(MjwU@#%P92#w><x
b#%cx&##V-k$>~D3SZf&A8EPlH37Y@_VT=%9
diff --git a/src/de/deadlocker8/roadgame/ui/PossibleTilesController.java b/src/de/deadlocker8/roadgame/ui/PossibleTilesController.java
index 971691e..5e49bd1 100644
--- a/src/de/deadlocker8/roadgame/ui/PossibleTilesController.java
+++ b/src/de/deadlocker8/roadgame/ui/PossibleTilesController.java
@@ -8,14 +8,16 @@ import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.FlowPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
import javafx.stage.Stage;
public class PossibleTilesController
{
- @FXML private VBox vbox;
+ @FXML private ScrollPane scrollPane;
+ @FXML private FlowPane flowPane;
@FXML private Button buttonBack;
private Stage stage;
@@ -24,8 +26,11 @@ public class PossibleTilesController
{
this.stage = stage;
- vbox.setSpacing(10.0);
- vbox.setAlignment(Pos.TOP_CENTER);
+ flowPane.setVgap(25);
+ flowPane.setHgap(25);
+
+ flowPane.prefWidthProperty().bind(scrollPane.widthProperty());
+ flowPane.prefHeightProperty().bind(scrollPane.heightProperty());
for(TileType key : tilePack.getTiles().keySet())
{
@@ -42,7 +47,7 @@ public class PossibleTilesController
hbox.getChildren().add(currentStack);
hbox.getChildren().add(labelTimes);
HBox.setMargin(labelTimes, new Insets(0, 0, 0, 25));
- vbox.getChildren().add(hbox);
+ flowPane.getChildren().add(hbox);
}
}
diff --git a/src/de/deadlocker8/roadgame/ui/PossibleTilesGUI.fxml b/src/de/deadlocker8/roadgame/ui/PossibleTilesGUI.fxml
index a73dc92..40fa33c 100644
--- a/src/de/deadlocker8/roadgame/ui/PossibleTilesGUI.fxml
+++ b/src/de/deadlocker8/roadgame/ui/PossibleTilesGUI.fxml
@@ -1,22 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
+<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.FlowPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-<AnchorPane prefHeight="600.0" prefWidth="300.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.roadgame.ui.PossibleTilesController">
+<AnchorPane prefHeight="500.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.deadlocker8.roadgame.ui.PossibleTilesController">
<children>
- <ScrollPane layoutX="14.0" layoutY="14.0" AnchorPane.bottomAnchor="56.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
- <content>
- <VBox fx:id="vbox" prefHeight="530.0" prefWidth="272.0" />
- </content>
- </ScrollPane>
- <Button fx:id="buttonBack" layoutX="119.0" layoutY="556.0" mnemonicParsing="false" onAction="#back" prefHeight="30.0" prefWidth="63.0" text="Back" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="119.0" AnchorPane.rightAnchor="118.0">
- <font>
- <Font name="System Bold" size="14.0" />
- </font>
- </Button>
+ <VBox alignment="TOP_CENTER" layoutX="14.0" layoutY="14.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
+ <children>
+ <ScrollPane fx:id="scrollPane" VBox.vgrow="ALWAYS">
+ <content>
+ <FlowPane fx:id="flowPane" prefHeight="418.0" prefWidth="565.0" />
+ </content>
+ </ScrollPane>
+ <Button fx:id="buttonBack" mnemonicParsing="false" onAction="#back" prefHeight="30.0" prefWidth="70.0" text="Back">
+ <font>
+ <Font name="System Bold" size="14.0" />
+ </font>
+ <VBox.margin>
+ <Insets top="14.0" />
+ </VBox.margin>
+ </Button>
+ </children>
+ </VBox>
</children>
</AnchorPane>
diff --git a/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java b/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java
index 190e99a..d64c497 100644
--- a/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java
+++ b/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java
@@ -78,8 +78,10 @@ public class SelectTilePackController
newStage.initModality(Modality.APPLICATION_MODAL);
newStage.setTitle("Possible Tiles");
newStage.setScene(new Scene(root));
+ newStage.setMinWidth(400);
+ newStage.setMinHeight(400);
newStage.getIcons().add(icon);
- newStage.setResizable(false);
+ newStage.setResizable(true);
PossibleTilesController newController = fxmlLoader.getController();
newController.init(newStage, controller, currentPack);
newStage.show();
--
GitLab