Merge e32c64a into dc3a2b7

Author: Lynesth

src/Dialogue/Dialogue.php

@@ -74,7 +74,7 @@ protected function calculateCoordinates() : void
         //x
         $parentStyle        = $this->parentMenu->getStyle();
         $dialogueHalfLength = (mb_strlen($this->text) + ($this->style->getPadding() * 2)) / 2;
-        $widthHalfLength    = ceil($parentStyle->getWidth() / 2);
+        $widthHalfLength    = ceil($parentStyle->getWidth() / 2 + $parentStyle->getMargin());
         $this->x            = $widthHalfLength - $dialogueHalfLength;
     }
 

src/Input/InputIO.php

@@ -132,7 +132,7 @@ private function calculateXPosition(Input $input, string $userInput) : int
 
         $parentStyle     = $this->parentMenu->getStyle();
         $halfWidth       = ($width + ($input->getStyle()->getPadding() * 2)) / 2;
-        $parentHalfWidth = ceil($parentStyle->getWidth() / 2);
+        $parentHalfWidth = ceil($parentStyle->getWidth() / 2 + $parentStyle->getMargin());
 
         return $parentHalfWidth - $halfWidth;
     }

src/MenuStyle.php

@@ -233,7 +233,7 @@ public function getUnselectedUnsetCode() : string
      */
     protected function calculateContentWidth() : void
     {
-        $this->contentWidth = $this->width - ($this->padding*2) - ($this->margin*2);
+        $this->contentWidth = $this->width - ($this->padding*2);
     }
 
     public function getFg() : string
@@ -267,13 +267,14 @@ public function getWidth() : int
 
     public function setWidth(int $width) : self
     {
-        $availableWidth = $this->terminal->getWidth() - ($this->margin * 2) - ($this->padding * 2);
-
-        if ($width >= $availableWidth) {
-            $width = $availableWidth;
+        if ($width >= $this->terminal->getWidth()) {
+            $width = $this->terminal->getWidth();
         }
 
         $this->width = $width;
+        if ($this->margin === -1) {
+            $this->setMargin(-1);
+        }
         $this->calculateContentWidth();
 
         return $this;
@@ -300,9 +301,11 @@ public function getMargin() : int
 
     public function setMargin(int $margin) : self
     {
-        $this->margin = $margin;
-
-        $this->calculateContentWidth();
+        if ($this->margin === -1) {
+            $this->margin = floor(($this->terminal->getWidth() - $this->width) / 2);
+        } else {
+            $this->margin = $margin;
+        }
 
         return $this;
     }