Skip to content
Snippets Groups Projects
Commit 67548e6f authored by Robert Goldmann's avatar Robert Goldmann
Browse files

NewPaymenGUI is now scrollable

parent 61f16733
No related branches found
No related tags found
1 merge request!213merge v1_6_0 into master
...@@ -32,6 +32,7 @@ import javafx.scene.control.DateCell; ...@@ -32,6 +32,7 @@ import javafx.scene.control.DateCell;
import javafx.scene.control.DatePicker; import javafx.scene.control.DatePicker;
import javafx.scene.control.Label; import javafx.scene.control.Label;
import javafx.scene.control.RadioButton; import javafx.scene.control.RadioButton;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.Spinner; import javafx.scene.control.Spinner;
import javafx.scene.control.SpinnerValueFactory; import javafx.scene.control.SpinnerValueFactory;
import javafx.scene.control.TextArea; import javafx.scene.control.TextArea;
...@@ -39,6 +40,7 @@ import javafx.scene.control.TextField; ...@@ -39,6 +40,7 @@ import javafx.scene.control.TextField;
import javafx.scene.control.ToggleGroup; import javafx.scene.control.ToggleGroup;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
import javafx.scene.layout.Priority; import javafx.scene.layout.Priority;
import javafx.scene.layout.VBox;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.stage.Modality; import javafx.stage.Modality;
import javafx.stage.Stage; import javafx.stage.Stage;
...@@ -49,6 +51,8 @@ import tools.Localization; ...@@ -49,6 +51,8 @@ import tools.Localization;
public class NewPaymentController extends BaseController implements Styleable public class NewPaymentController extends BaseController implements Styleable
{ {
@FXML private ScrollPane scrollPane;
@FXML private VBox vboxContent;
@FXML private TextField textFieldName; @FXML private TextField textFieldName;
@FXML private TextField textFieldAmount; @FXML private TextField textFieldAmount;
@FXML private Button buttonCancel; @FXML private Button buttonCancel;
...@@ -111,6 +115,8 @@ public class NewPaymentController extends BaseController implements Styleable ...@@ -111,6 +115,8 @@ public class NewPaymentController extends BaseController implements Styleable
@Override @Override
public void init() public void init()
{ {
vboxContent.prefWidthProperty().bind(scrollPane.widthProperty().subtract(25));
applyStyle(); applyStyle();
SpinnerValueFactory<Integer> valueFactory = new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 1000, 0); SpinnerValueFactory<Integer> valueFactory = new SpinnerValueFactory.IntegerSpinnerValueFactory(1, 1000, 0);
...@@ -544,6 +550,7 @@ public class NewPaymentController extends BaseController implements Styleable ...@@ -544,6 +550,7 @@ public class NewPaymentController extends BaseController implements Styleable
buttonCancel.setGraphic(Helpers.getFontIcon(FontIconType.TIMES, 17, Color.WHITE)); buttonCancel.setGraphic(Helpers.getFontIcon(FontIconType.TIMES, 17, Color.WHITE));
buttonSave.setGraphic(Helpers.getFontIcon(FontIconType.SAVE, 17, Color.WHITE)); buttonSave.setGraphic(Helpers.getFontIcon(FontIconType.SAVE, 17, Color.WHITE));
scrollPane.setStyle("-fx-background-color: transparent");
buttonCancel.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 15;"); buttonCancel.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 15;");
buttonSave.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 15;"); buttonSave.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(Colors.BACKGROUND_BUTTON_BLUE) + "; -fx-text-fill: white; -fx-font-weight: bold; -fx-font-size: 15;");
} }
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<?import javafx.scene.control.DatePicker?> <?import javafx.scene.control.DatePicker?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.control.RadioButton?> <?import javafx.scene.control.RadioButton?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.Separator?> <?import javafx.scene.control.Separator?>
<?import javafx.scene.control.Spinner?> <?import javafx.scene.control.Spinner?>
<?import javafx.scene.control.TextArea?> <?import javafx.scene.control.TextArea?>
...@@ -18,7 +19,9 @@ ...@@ -18,7 +19,9 @@
<AnchorPane prefHeight="600.0" prefWidth="450.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1"> <AnchorPane prefHeight="600.0" prefWidth="450.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1">
<children> <children>
<VBox prefHeight="273.0" prefWidth="465.0" spacing="20.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0"> <ScrollPane fx:id="scrollPane" hbarPolicy="NEVER" layoutX="14.0" layoutY="14.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
<content>
<VBox fx:id="vboxContent" prefHeight="544.0" prefWidth="414.0" spacing="20.0">
<children> <children>
<HBox alignment="CENTER_LEFT" prefHeight="30.0" prefWidth="465.0"> <HBox alignment="CENTER_LEFT" prefHeight="30.0" prefWidth="465.0">
<children> <children>
...@@ -208,6 +211,11 @@ ...@@ -208,6 +211,11 @@
</VBox.margin> </VBox.margin>
</HBox> </HBox>
</children> </children>
<padding>
<Insets bottom="15.0" />
</padding>
</VBox> </VBox>
</content>
</ScrollPane>
</children> </children>
</AnchorPane> </AnchorPane>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment