From 4ace5fcdc3f83fc7228f76b96adc0f26f7e3a734 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Thu, 4 May 2017 19:05:11 +0200 Subject: [PATCH] Fixed #97 - don't select chart categories on refresh every time --- .../logic/chartGenerators/CategoriesChartGenerator.java | 4 +--- src/de/deadlocker8/budgetmaster/ui/ChartController.java | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java b/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java index f43132f12..6a476534d 100644 --- a/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java +++ b/src/de/deadlocker8/budgetmaster/logic/chartGenerators/CategoriesChartGenerator.java @@ -45,9 +45,7 @@ public class CategoriesChartGenerator for(CategoryInOutSum currentItem : categoryInOutSums) { Label currentPart = new Label(); - //TODO maybe use gradient - currentPart.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(currentItem.getColor())); -// currentPart.setStyle("-fx-background-color: linear-gradient(to bottom right, " + ConvertTo.toRGBHexWithoutOpacity(currentItem.getColor()) + ", " + ConvertTo.toRGBHexWithoutOpacity(currentItem.getColor().darker()) + ")"); + currentPart.setStyle("-fx-background-color: " + ConvertTo.toRGBHexWithoutOpacity(currentItem.getColor())); currentPart.prefHeightProperty().bind(chart.heightProperty()); chart.getChildren().add(currentPart); diff --git a/src/de/deadlocker8/budgetmaster/ui/ChartController.java b/src/de/deadlocker8/budgetmaster/ui/ChartController.java index e91a2dab6..bd77351fb 100644 --- a/src/de/deadlocker8/budgetmaster/ui/ChartController.java +++ b/src/de/deadlocker8/budgetmaster/ui/ChartController.java @@ -112,6 +112,8 @@ public class ChartController implements Refreshable radioButtonBars.setToggleGroup(toggleGroup); radioButtonBars.setSelected(true); radioButtonLines.setToggleGroup(toggleGroup); + + accordion.setExpandedPane(accordion.getPanes().get(0)); } public void chartCategoriesShow() @@ -226,9 +228,5 @@ public class ChartController implements Refreshable // chart month chartMonthShow(); - - // TODO combine bar und line chart (radio buttons) - - accordion.setExpandedPane(accordion.getPanes().get(0)); } } \ No newline at end of file -- GitLab