Skip to content

Fix right padding when row too long #112

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 2 commits into from
May 8, 2018
Merged

Fix right padding when row too long #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d1412b
Fix right padding when row too long
AydinHassan May 7, 2018
aa4c9c8
Move right hand padding calculation to MenuStyle and add tests
AydinHassan May 8, 2018
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
8 changes: 7 additions & 1 deletion src/MenuStyle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,13 @@ public function getContentWidth() : int
*/
public function getRightHandPadding(int $contentLength) : int
{
return $this->getContentWidth() - $contentLength + $this->getPadding();
$rightPadding = $this->getContentWidth() - $contentLength + $this->getPadding();

if ($rightPadding < 0) {
$rightPadding = 0;
}

return $rightPadding;
}

public function getSelectedMarker() : string
Expand Down
29 changes: 29 additions & 0 deletions test/MenuStyleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,35 @@ public function testRightHandPaddingCalculation() : void
static::assertSame(241, $style->getRightHandPadding(50));
}

public function testRightHandPaddingReturnsZeroWhenContentLengthTooLong() : void
{
$style = $this->getMenuStyle();
$style->setPadding(0);
$style->setMargin(0);
$style->setBorder(0);

$style->setWidth(100);

self::assertEquals(0, $style->getRightHandPadding(100));
self::assertEquals(0, $style->getRightHandPadding(150));
}

public function testRightHandPaddingReturnsZeroWhenContentLengthTooLongBecauseOfBorder() : void
{
$style = $this->getMenuStyle();
$style->setPadding(10);
$style->setMargin(0);
$style->setBorder(10);

$style->setWidth(100);

self::assertEquals(11, $style->getRightHandPadding(59));
self::assertEquals(10, $style->getRightHandPadding(60));
self::assertEquals(0, $style->getRightHandPadding(70));
self::assertEquals(0, $style->getRightHandPadding(71));
self::assertEquals(0, $style->getRightHandPadding(100));
}

public function testMargin() : void
{
$style = $this->getMenuStyle();
Expand Down