From 08cc50c22a285e5d620f4c7d96a91a72194cf980 Mon Sep 17 00:00:00 2001
From: VladimirEliTokarev <vladimirelitokarev@gmail.com>
Date: Sat, 12 Nov 2016 17:37:42 +0200
Subject: [PATCH] Resulted the bug with the not expendable panel

---
 .../voting/gui/configuration/Converter.java   |   2 +-
 .../VotingBoothConfiguration.json             |   4 +++
 .../resources/configuration/configuration.bin | Bin 101821 -> 139432 bytes
 .../view/select_candidate_by_picture.fxml     |  26 +++++++++---------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/Converter.java b/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/Converter.java
index 957d889..f6336d0 100644
--- a/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/Converter.java
+++ b/voting-booth-gui/src/main/java/meerkat/voting/gui/configuration/Converter.java
@@ -13,7 +13,7 @@ import java.io.IOException;
  * This class uses the configuration creator which converts json configuration into normal binary proto file
  */
 public class Converter {
-    private final static String DEFAULT_OUTPUT_PATH = "configuration.bin";
+    private final static String DEFAULT_OUTPUT_PATH = "configuration- old but gold.bin";
     private final static String DEFAULT_CONFIGURATION_PATH = "VotingBoothConfiguration.json";
     private final static String CONVERTER_DESCRIPTION = "Welcome to simple voting booth " +
             "configuration converter (which converts json voting booth configuration into " +
diff --git a/voting-booth-gui/src/main/resources/configuration/VotingBoothConfiguration.json b/voting-booth-gui/src/main/resources/configuration/VotingBoothConfiguration.json
index d3bd1ce..ed73683 100644
--- a/voting-booth-gui/src/main/resources/configuration/VotingBoothConfiguration.json
+++ b/voting-booth-gui/src/main/resources/configuration/VotingBoothConfiguration.json
@@ -41,6 +41,10 @@
             "answer": "/images/MichaelJackson.png",
              "description": "Michael Jakson image."
           },
+          {
+            "answer": "/images/AntonioBanderass.png",
+            "description": "Antonio Banderass image."
+          },
           {
             "answer": "/images/AntonioBanderass.png",
             "description": "Antonio Banderass image."
diff --git a/voting-booth-gui/src/main/resources/configuration/configuration.bin b/voting-booth-gui/src/main/resources/configuration/configuration.bin
index 13e84e1fcf909bd9956774d9f40ee5fe595a4f9c..3c131694b2d1ff7e625a89a8663ed89669cfa8e9 100644
GIT binary patch
delta 33
rcmV++0N($-n+B-C2o4JNzX%G^zX%8d63f2`fey6}0pN_Y1Nyp?-enE3

delta 33
pcmZ2+kYn#`Ha@QIS!`U-X0mZG2|bv}*2uS&kMTjz^qcZb=K;+$3|s&J

diff --git a/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml b/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml
index cbfb246..28467ee 100644
--- a/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml
+++ b/voting-booth-gui/src/main/resources/view/select_candidate_by_picture.fxml
@@ -120,27 +120,27 @@
                   </BorderPane>
                </children>
             </GridPane>
-            <GridPane prefHeight="250.0" prefWidth="600.0" GridPane.rowIndex="1">
+            <GridPane GridPane.rowIndex="1">
               <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" maxWidth="144.0" minWidth="10.0" prefWidth="25.0" />
-                  <ColumnConstraints hgrow="SOMETIMES" maxWidth="552.0" minWidth="10.0" prefWidth="548.0" />
-                <ColumnConstraints hgrow="SOMETIMES" maxWidth="192.0" minWidth="10.0" prefWidth="25.0" />
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="273.0" />
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
               </columnConstraints>
               <rowConstraints>
-                <RowConstraints maxHeight="57.0" minHeight="0.0" prefHeight="9.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="213.0" minHeight="10.0" prefHeight="213.0" vgrow="SOMETIMES" />
-                <RowConstraints maxHeight="41.0" minHeight="5.0" prefHeight="5.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="0.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                <RowConstraints minHeight="5.0" vgrow="SOMETIMES" />
               </rowConstraints>
                <children>
-                  <BorderPane prefHeight="250.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
+                  <BorderPane GridPane.columnIndex="1" GridPane.rowIndex="1">
                      <center>
-                        <ScrollPane prefHeight="250.0" prefWidth="200.0" BorderPane.alignment="CENTER">
+                        <ScrollPane BorderPane.alignment="CENTER">
                           <content>
-                            <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="199.0" prefWidth="1000.0">
+                            <AnchorPane>
                                  <children>
-                                    <Pane prefHeight="199.0" prefWidth="1000.0">
+                                    <Pane>
                                        <children>
-                                          <GridPane fx:id="AnswersGridPane" layoutY="-2.0" prefHeight="199.0" prefWidth="1000.0">
+                                          <GridPane fx:id="AnswersGridPane" layoutY="-2.0">
                                           </GridPane>
                                        </children>
                                     </Pane>
@@ -160,7 +160,7 @@
    </columnConstraints>
    <rowConstraints>
       <RowConstraints maxHeight="129.0" minHeight="0.0" prefHeight="31.0" vgrow="SOMETIMES" />
-      <RowConstraints maxHeight="326.0" minHeight="10.0" prefHeight="315.0" vgrow="SOMETIMES" />
+      <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
       <RowConstraints maxHeight="75.0" minHeight="10.0" prefHeight="35.0" vgrow="SOMETIMES" />
    </rowConstraints>
 </GridPane>