sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NxWidgets::CImage: Should not attempt to draw the empty regions at the top and the bottom of the image box in greyscale

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-17 10:15:41 -06:00
parent 010cc0e624
commit 6f18adea58
1 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libnxwidgets/src/cimage.cxx
View File

@ -230,18 +230,10 @@ void CImage::drawContents(CGraphicsPort *port, bool selected)
for (int padRow = 0; padRow < m_origin.y; padRow++, destRow++) for (int padRow = 0; padRow < m_origin.y; padRow++, destRow++)
{ {
// Put the padded row on the display // Put the padded row on the display (never greyscale)
if (isEnabled()) port->drawBitmap(rect.getX(), destRow, rect.getWidth(), 1,
{ &bitmap, 0, 0);
port->drawBitmap(rect.getX(), destRow, rect.getWidth(), 1,
&bitmap, 0, 0);
}
else
{
port->drawBitmapGreyScale(rect.getX(), destRow, rect.getWidth(),
1, &bitmap, 0, 0);
}
} }
// This is the number of rows that we can draw at the top of the display // This is the number of rows that we can draw at the top of the display
@ -303,7 +295,7 @@ void CImage::drawContents(CGraphicsPort *port, bool selected)
else else
{ {
port->drawBitmapGreyScale(rect.getX(), destRow, port->drawBitmapGreyScale(rect.getX(), destRow,
rect.getWidth(), 1, &bitmap, 0, 0); rect.getWidth(), 1, &bitmap, 0, 0);
} }
} }
} }
@ -324,18 +316,10 @@ void CImage::drawContents(CGraphicsPort *port, bool selected)
for (; destRow < rect.getHeight(); destRow++) for (; destRow < rect.getHeight(); destRow++)
{ {
// Put the padded row on the display // Put the padded row on the display (never greyscale)
if (isEnabled()) port->drawBitmap(rect.getX(), destRow, rect.getWidth(), 1,
{ &bitmap, 0, 0);
port->drawBitmap(rect.getX(), destRow, rect.getWidth(), 1,
&bitmap, 0, 0);
}
else
{
port->drawBitmapGreyScale(rect.getX(), destRow,
rect.getWidth(), 1, &bitmap, 0, 0);
}
} }
} }