Skip to content

Do not print right margin #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2018
Merged

Do not print right margin #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/CliMenu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ protected function drawMenuItem(MenuItemInterface $item, bool $selected = false)

return array_map(function ($row) use ($invertedColour, $notInvertedColour, $borderColour) {
return sprintf(
"%s%s%s%s%s%s%s%s%s%s%s%s%s\n",
"%s%s%s%s%s%s%s%s%s%s%s%s\n",
str_repeat(' ', $this->style->getMargin()),
$borderColour,
str_repeat(' ', $this->style->getBorderLeftWidth()),
Expand All @@ -399,8 +399,7 @@ protected function drawMenuItem(MenuItemInterface $item, bool $selected = false)
$notInvertedColour,
$borderColour,
str_repeat(' ', $this->style->getBorderRightWidth()),
$this->style->getColoursResetCode(),
str_repeat(' ', $this->style->getMargin())
$this->style->getColoursResetCode()
);
}, $rows);
}
Expand Down
5 changes: 2 additions & 3 deletions src/MenuStyle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,12 +489,11 @@ public function setTitleSeparator(string $actionSeparator) : self
private function generateBorderRows() : void
{
$borderRow = sprintf(
"%s%s%s%s%s\n",
"%s%s%s%s\n",
str_repeat(' ', $this->margin),
$this->getBorderColourCode(),
str_repeat(' ', $this->width),
$this->coloursResetCode,
str_repeat(' ', $this->margin)
$this->coloursResetCode
);

$this->borderTopRows = array_fill(0, $this->borderTopWidth, $borderRow);
Expand Down
10 changes: 5 additions & 5 deletions test/res/testAddCustomControlMapping.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


10 changes: 5 additions & 5 deletions test/res/testAddCustomControlMappings.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


20 changes: 10 additions & 10 deletions test/res/testConfirmCanOnlyBeClosedWithEnter.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


 
Expand All @@ -14,10 +14,10 @@
 


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


20 changes: 10 additions & 10 deletions test/res/testConfirmWithEvenLengthConfirmAndButton.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


 
Expand All @@ -14,10 +14,10 @@
 


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


20 changes: 10 additions & 10 deletions test/res/testConfirmWithEvenLengthConfirmAndOddLengthButton.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


 
Expand All @@ -14,10 +14,10 @@
 


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


20 changes: 10 additions & 10 deletions test/res/testConfirmWithOddLengthConfirmAndButton.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


 
Expand All @@ -14,10 +14,10 @@
 


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


20 changes: 10 additions & 10 deletions test/res/testConfirmWithOddLengthConfirmAndEvenLengthButton.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


 
Expand All @@ -14,10 +14,10 @@
 


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


20 changes: 10 additions & 10 deletions test/res/testFlashCanBeClosedWithAnyKey.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


 
 PHP School FTW! 
 


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


20 changes: 10 additions & 10 deletions test/res/testFlashWithEvenLength.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


 
 PHP School FTW 
 


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


20 changes: 10 additions & 10 deletions test/res/testFlashWithOddLength.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


 
 PHP School FTW! 
 


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


20 changes: 10 additions & 10 deletions test/res/testReDrawReDrawsImmediately.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 




 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


10 changes: 5 additions & 5 deletions test/res/testSimpleOpenClose.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@


 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 
 
 PHP School FTW 
 ========================================== 
 ● Item 1 
 


14 changes: 7 additions & 7 deletions test/res/testSimpleOpenCloseWithBorders.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@


 
   
  PHP School FTW  
  ======================================  
  ● Item 1  
   
 
 
   
  PHP School FTW  
  ======================================  
  ● Item 1  
   
 


10 changes: 5 additions & 5 deletions test/res/testSimpleOpenCloseWithLeftAndRightBorders.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@


   
  PHP School FTW  
  ======================================  
  ● Item 1  
   
   
  PHP School FTW  
  ======================================  
  ● Item 1  
   


Loading