Fix centering

php-school · Oct 27, 2016 · fff333f · fff333f
1 parent e9b166b
commit fff333f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/src/Dialogue/Confirm.php b/src/Dialogue/Confirm.php
@@ -24,9 +24,11 @@ public function display($confirmText = 'OK')
         $this->emptyRow();
 
         $this->write(sprintf(
-            "%s  %s  %s\n",
+            "%s%s%s%s%s\n",
             $this->style->getUnselectedSetCode(),
+            str_repeat(' ', $this->style->getPadding()),
             $this->text,
+            str_repeat(' ', $this->style->getPadding()),
             $this->style->getUnselectedUnsetCode()
         ));
 
@@ -63,9 +65,11 @@ public function display($confirmText = 'OK')
         );
 
         $this->write(sprintf(
-            "%s  %s  %s\n",
+            "%s%s%s%s%s\n",
             $this->style->getUnselectedSetCode(),
+            str_repeat(' ', $this->style->getPadding()),
             str_repeat(' ', mb_strlen($this->text)),
+            str_repeat(' ', $this->style->getPadding()),
             $this->style->getUnselectedUnsetCode()
         ));
 

diff --git a/src/Dialogue/Dialogue.php b/src/Dialogue/Dialogue.php
@@ -73,9 +73,15 @@ protected function assertMenuOpen()
      */
     protected function calculateCoordinates()
     {
-        $textLines = count(explode("\n", $this->text)) + 2;
-        $this->y = ceil(($this->parentMenu->getCurrentFrame()->count() / 2)) - ceil($textLines / 2) + 1;
-        $this->x = ($this->style->getWidth() / 2) - (mb_strlen($this->text) / 2);
+        //y
+        $textLines          = count(explode("\n", $this->text)) + 2;
+        $this->y            = ceil($this->parentMenu->getCurrentFrame()->count() / 2) - ceil($textLines / 2) + 1;
+
+        //x
+        $parentStyle        = $this->parentMenu->getStyle();
+        $dialogueHalfLength = (mb_strlen($this->text) + ($this->style->getPadding() * 2)) / 2;
+        $widthHalfLength    = ceil($parentStyle->getWidth() / 2);
+        $this->x            = $widthHalfLength - $dialogueHalfLength;
     }
 
     /**
@@ -85,9 +91,11 @@ protected function emptyRow()
     {
         $this->write(
             sprintf(
-                "%s  %s  %s\n",
+                "%s%s%s%s%s\n",
                 $this->style->getUnselectedSetCode(),
+                str_repeat(' ', $this->style->getPadding()),
                 str_repeat(' ', mb_strlen($this->text)),
+                str_repeat(' ', $this->style->getPadding()),
                 $this->style->getUnselectedUnsetCode()
             )
         );

diff --git a/src/Dialogue/Flash.php b/src/Dialogue/Flash.php
@@ -20,9 +20,11 @@ public function display()
         $this->emptyRow();
 
         $this->write(sprintf(
-            "%s  %s  %s\n",
+            "%s%s%s%s%s\n",
             $this->style->getUnselectedSetCode(),
+            str_repeat(' ', $this->style->getPadding()),
             $this->text,
+            str_repeat(' ', $this->style->getPadding()),
             $this->style->getUnselectedUnsetCode()
         ));