Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
EthanZeigler committed May 22, 2016
2 parents 648367b + d902931 commit 88c9c4d
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public boolean removeButtonClickListener(ButtonClickListener listener) {
*/
@Override
public double getWidth() {
return 0;
return width;
}

/**
Expand All @@ -96,6 +96,6 @@ public double getWidth() {
*/
@Override
public double getHeight() {
return 0;
return height;
}
}

0 comments on commit 88c9c4d

Please sign in to comment.