diff --git a/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java b/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java index aee3f4950023c9190f84cb3d3f2b0f7913023e18..fb32bf947c888efa1445f71ac8671782c36bcac3 100644 --- a/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java +++ b/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java @@ -105,12 +105,21 @@ public class CategoriesChartGenerator legendItems.add(getLegendItem(label, currentItem.getColor())); } - int legendWidth = (int)Math.ceil(Math.sqrt(legendItems.size())); + int legendWidth; + int numberOfItems = legendItems.size(); + if(numberOfItems <= 3) + { + legendWidth = numberOfItems; + } + else + { + legendWidth = (int)Math.ceil(Math.sqrt(numberOfItems)); + } - for(int i = 0; i < legendItems.size(); i++) + for(int i = 0; i < numberOfItems; i++) { int columnIndex = i % legendWidth; - int rowIndex = i / 4; + int rowIndex = i / legendWidth; legend.add(legendItems.get(i), columnIndex, rowIndex); } diff --git a/src/de/deadlocker8/budgetmaster/main/Main.java b/src/de/deadlocker8/budgetmaster/main/Main.java index f6594ae5775a8bb0c95f4aa4ab8c4a4fce535f6e..cd3555d262e161e21c2952a155ec0a0d2fdc26b2 100644 --- a/src/de/deadlocker8/budgetmaster/main/Main.java +++ b/src/de/deadlocker8/budgetmaster/main/Main.java @@ -27,7 +27,7 @@ public class Main extends Application FXMLLoader loader = new FXMLLoader(getClass().getClassLoader().getResource("de/deadlocker8/budgetmaster/ui/SplashScreen.fxml")); Parent root = (Parent)loader.load(); - Scene scene = new Scene(root, 400, 230); + Scene scene = new Scene(root, 450, 230); ((SplashScreenController)loader.getController()).init(stage, new Image("/de/deadlocker8/budgetmaster/resources/icon.png"), bundle); diff --git a/src/de/deadlocker8/budgetmaster/ui/GUI.fxml b/src/de/deadlocker8/budgetmaster/ui/GUI.fxml index 1f7694e06c1b54adc5b427474548f0cd56507192..549a7e45e216a6d0604a3c12e9cd1a3263dfaf82 100644 --- a/src/de/deadlocker8/budgetmaster/ui/GUI.fxml +++ b/src/de/deadlocker8/budgetmaster/ui/GUI.fxml @@ -24,9 +24,9 @@ </HBox.margin> </Region> <Button fx:id="buttonLeft" mnemonicParsing="false" onAction="#previousMonth" /> - <Label fx:id="labelMonth" alignment="CENTER" prefHeight="36.0" prefWidth="196.0" text="Dezember 2016"> + <Label fx:id="labelMonth" alignment="CENTER" prefHeight="36.0" prefWidth="280.0" text="Dezember 2016" HBox.hgrow="ALWAYS"> <font> - <Font name="System Bold" size="25.0" /> + <Font name="System Bold" size="24.0" /> </font> </Label> <Button fx:id="buttonRight" mnemonicParsing="false" onAction="#nextMonth" />