Skip to content

Return width instead of void to be coherent with drawChar #5

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

Open
xseignard wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Return width instead of void to be coherent with drawChar #5

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
15 changes: 8 additions & 7 deletions DMD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,12 @@ void

}

void DMD::drawString(int bX, int bY, const char *bChars, byte length,
int DMD::drawString(int bX, int bY, const char *bChars, byte length,
byte bGraphicsMode)
{
if (bX >= (DMD_PIXELS_ACROSS*DisplaysWide) || bY >= DMD_PIXELS_DOWN * DisplaysHigh)
return;
if (bX >= (DMD_PIXELS_ACROSS*DisplaysWide) || bY >= DMD_PIXELS_DOWN * DisplaysHigh) return 0;
uint8_t height = pgm_read_byte(this->Font + FONT_HEIGHT);
if (bY+height<0) return;
if (bY+height<0) return 0;

int strWidth = 0;
this->drawLine(bX -1 , bY, bX -1 , bY + height, GRAPHICS_INVERSE);
Expand All @@ -145,13 +144,14 @@ void DMD::drawString(int bX, int bY, const char *bChars, byte length,
this->drawLine(bX + strWidth , bY, bX + strWidth , bY + height, GRAPHICS_INVERSE);
strWidth++;
} else if (charWide < 0) {
return;
return 0;
}
if ((bX + strWidth) >= DMD_PIXELS_ACROSS * DisplaysWide || bY >= DMD_PIXELS_DOWN * DisplaysHigh) return;
if ((bX + strWidth) >= DMD_PIXELS_ACROSS * DisplaysWide || bY >= DMD_PIXELS_DOWN * DisplaysHigh) return 0;
}
return strWidth;
}

void DMD::drawMarquee(const char *bChars, byte length, int left, int top)
int DMD::drawMarquee(const char *bChars, byte length, int left, int top)
{
marqueeWidth = 0;
for (int i = 0; i < length; i++) {
Expand All @@ -165,6 +165,7 @@ void DMD::drawMarquee(const char *bChars, byte length, int left, int top)
marqueeLength = length;
drawString(marqueeOffsetX, marqueeOffsetY, marqueeText, marqueeLength,
GRAPHICS_NORMAL);
return marqueeWidth;
}

boolean DMD::stepMarquee(int amountX, int amountY)
Expand Down
4 changes: 2 additions & 2 deletions DMD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class DMD
void writePixel( unsigned int bX, unsigned int bY, byte bGraphicsMode, byte bPixel );

//Draw a string
void drawString( int bX, int bY, const char* bChars, byte length, byte bGraphicsMode);
int drawString( int bX, int bY, const char* bChars, byte length, byte bGraphicsMode);

//Select a text font
void selectFont(const uint8_t* font);
Expand All @@ -139,7 +139,7 @@ class DMD
int charWidth(const char letter);

//Draw a scrolling string
void drawMarquee( const char* bChars, byte length, int left, int top);
int drawMarquee( const char* bChars, byte length, int left, int top);

//Move the maquee accross by amount
boolean stepMarquee( int amountX, int amountY);
Expand Down