- Implemented: #15133: Better configurable axis spaces.

# Large number of tests added. Had to go through all sensible combinations of
# axis and axis spaces to ensure it works correctly.

1 files changed, 5 insertions, 13 deletions

diff --git a/src/charts/line.php b/src/charts/line.php
index 4c0ba14..4d0fc84 100644
--- a/src/charts/line.php
+++ b/src/charts/line.php
@@ -627,25 +627,17 @@ class ezcGraphLineChart extends ezcGraphChart
         // Calculate inner data boundings of chart
         $innerBoundings = new ezcGraphBoundings(
             $boundings->x0 + $boundings->width *
-                ( ( ( $this->elements['yAxis']->outerAxisSpace === null ) || 
-                    ( $this->elements['xAxis']->position === ezcGraph::LEFT ) ) ?
-                    $this->elements['yAxis']->axisSpace :
-                    $this->elements['yAxis']->outerAxisSpace ),
+                    $this->elements['yAxis']->axisSpace,
             $boundings->y0 + $boundings->height *
-                ( ( ( $this->elements['xAxis']->outerAxisSpace === null ) || 
-                    ( $this->elements['yAxis']->position === ezcGraph::TOP ) ) ?
+                ( ( $this->elements['xAxis']->outerAxisSpace === null ) ?
                     $this->elements['xAxis']->axisSpace :
-                    $this->elements['yAxis']->outerAxisSpace ),
+                    $this->elements['xAxis']->outerAxisSpace ),
             $boundings->x1 - $boundings->width *
-                ( ( ( $this->elements['yAxis']->outerAxisSpace === null ) || 
-                    ( $this->elements['xAxis']->position === ezcGraph::RIGHT ) ) ?
+                ( ( $this->elements['yAxis']->outerAxisSpace === null ) ?
                     $this->elements['yAxis']->axisSpace :
                     $this->elements['yAxis']->outerAxisSpace ),
             $boundings->y1 - $boundings->height *
-                ( ( ( $this->elements['xAxis']->outerAxisSpace === null ) || 
-                    ( $this->elements['yAxis']->position === ezcGraph::BOTTOM ) ) ?
-                    $this->elements['xAxis']->axisSpace :
-                    $this->elements['yAxis']->outerAxisSpace )
+                    $this->elements['xAxis']->axisSpace
         );
 
         // Render axis