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

Fixed #117, adjusted stage start width

chart legend items overlap
parent 0f61d410
Branches
Tags
2 merge requests!142merge v1_3_0 into master,!121Merge Reports into v1_3_0
......@@ -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);
}
......
......@@ -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);
......
......@@ -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" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment