From 2d83266eb13e881ceef19a0d9780605f444e488b Mon Sep 17 00:00:00 2001
From: Tim Molter <tim.molter@gmail.com>
Date: Thu, 28 Mar 2013 16:57:42 +0100
Subject: [PATCH] bug fixes - plot right padding was falsely calculated.
---
.../xeiam/xchart/internal/chartpart/Axis.java | 20 ++++++++++++++++---
.../xeiam/xchart/internal/chartpart/Plot.java | 4 +++-
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
index d6b8dcfa..15b44ee2 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
@@ -197,9 +197,23 @@ public class Axis implements ChartPart {
chartLegendWidth = getChartPainter().getChartLegend().getSizeHint()[0];
}
- int width = (int) (getChartPainter().getWidth() - axisPair.getyAxis().getBounds().getWidth() - chartLegendWidth - 2 * getChartPainter().getStyleManager().getChartPadding()
- - getChartPainter().getStyleManager().getPlotPadding() - (getChartPainter().getStyleManager().getLegendPosition() == LegendPosition.OutsideE ? getChartPainter().getStyleManager()
- .getChartPadding() : 0));
+ int width = (int) (
+
+ getChartPainter().getWidth()
+
+ - axisPair.getyAxis().getBounds().getWidth()
+
+ - chartLegendWidth
+
+ - 2 * getChartPainter().getStyleManager().getChartPadding()
+
+ - (getChartPainter().getStyleManager().isYAxisTicksVisible() ? (getChartPainter().getStyleManager().getPlotPadding() + 1) : 0)
+
+ - (getChartPainter().getStyleManager().getLegendPosition() == LegendPosition.OutsideE && getChartPainter().getStyleManager().isLegendVisible() ? getChartPainter().getStyleManager()
+ .getChartPadding() : 0)
+
+ );
+
int height = this.getSizeHint();
Rectangle xAxisRectangle = new Rectangle(xOffset, yOffset, width, height);
this.paintZone = xAxisRectangle;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
index b2d81a31..32bf69a3 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
@@ -63,7 +63,9 @@ public class Plot implements ChartPart {
+ chartPainter.getAxisPair().getyAxis().getBounds().getWidth()
- + (chartPainter.getStyleManager().isYAxisTicksVisible() ? (chartPainter.getStyleManager().getPlotPadding() + 1) : 0));
+ + (chartPainter.getStyleManager().isYAxisTicksVisible() ? (chartPainter.getStyleManager().getPlotPadding() + 1) : 0)
+
+ );
int yOffset = (int) (chartPainter.getAxisPair().getyAxis().getBounds().getY());
int width = (int) chartPainter.getAxisPair().getxAxis().getBounds().getWidth();
--
GitLab