Merge pull request #83 from matoos32/81-xytitlebuilder-not-using-the-…

…max-width-and-height Add setting of XYTitleAnnotation max width and height
matoos32 · Dec 5, 2022 · cc31414 · cc31414
2 parents 0e64aa4 + 6b35e3a
commit cc31414
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/demo-app/src/main/java/com/jfcbuilder/demo/JFreeChartBuilderDemo.java b/demo-app/src/main/java/com/jfcbuilder/demo/JFreeChartBuilderDemo.java
@@ -509,6 +509,10 @@ private static ChartBuilder getDailyStockChartBuilder(StockChartConfig cfg) {
         .annotation(XYTitleBuilder.get()
           .title(new TextTitle("OHLC Title")).x(0.5).y(0.9).anchor(RectangleAnchor.BOTTOM))
 
+        .annotation(XYTitleBuilder.get()
+              .title(new TextTitle("Subtitle")).x(0.5).y(0.8).maxHeight(0.05).maxWidth(0.05)
+              .anchor(RectangleAnchor.BOTTOM))
+
         .annotation(XYPolygonBuilder.get().polygon(ohlcPolygon))
 
         .annotation(XYDrawableBuilder.get()

diff --git a/framework/src/main/java/com/jfcbuilder/builders/XYTitleBuilder.java b/framework/src/main/java/com/jfcbuilder/builders/XYTitleBuilder.java
@@ -239,8 +239,20 @@ private void checkBuildPreconditions() throws IllegalStateException {
   public XYAnnotation build() throws IllegalStateException {
 
     checkBuildPreconditions();
-    // FIXME: Add missing calls to set the max width and height.
-    return new XYTitleAnnotation(x, y, title, anchor);
+
+    XYTitleAnnotation annotation = new XYTitleAnnotation(x, y, title, anchor);
+
+    // Check if max width/height are using defaults to avoid XYTitleAnnotation firing change events.
+
+    if (Double.compare(maxWidth, DEFAULT_MAX_WIDTH) != 0) {
+      annotation.setMaxWidth(maxWidth);
+    }
+
+    if (Double.compare(maxHeight, DEFAULT_MAX_HEIGHT) != 0) {
+      annotation.setMaxHeight(maxHeight);
+    }
+
+    return annotation;
   }
 
   @Override