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

NXWidgets::CNxWidget: Remove an unused bit field

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-28 12:47:01 -06:00
parent 42ef5ab70d
commit 94cec8caff
3 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libnxwidgets/include/cnxwidget.hxx
View File

@ -151,7 +151,6 @@ namespace NXWidgets
uint8_t enabled : 1; /**< True if the widget is enabled. */ uint8_t enabled : 1; /**< True if the widget is enabled. */
uint8_t permeable : 1; /**< True if the widget's children can exceed its dimensions. */ uint8_t permeable : 1; /**< True if the widget's children can exceed its dimensions. */
uint8_t erased : 1; /**< True if the widget is currently erased from the frame buffer. */ uint8_t erased : 1; /**< True if the widget is currently erased from the frame buffer. */
uint8_t visibleRegionCacheInvalid : 1; /**< True if the region cache is invalid. */
uint8_t hidden : 1; /**< True if the widget is hidden. */ uint8_t hidden : 1; /**< True if the widget is hidden. */
uint8_t doubleClickable : 1; /**< True if the widget can be double-clicked. */ uint8_t doubleClickable : 1; /**< True if the widget can be double-clicked. */
} Flags; } Flags;

25
libnxwidgets/src/clabel.cxx
View File

@ -322,15 +322,26 @@ void CLabel::drawContents(CGraphicsPort *port)
int width = font->getStringWidth(m_text); int width = font->getStringWidth(m_text);
// Draw the background (excluding the border and the text area) // Draw the background (excluding the border and the text area)
// Left
port->drawFilledRect(rect.getX(), rect.getY(), port->drawFilledRect(rect.getX(), rect.getY(),
pos.x - rect.getX(), rect.getHeight(), backColor); // Left pos.x - rect.getX(), rect.getHeight(), backColor);
// Right
port->drawFilledRect(pos.x + width, rect.getY(), port->drawFilledRect(pos.x + width, rect.getY(),
rect.getX2() - (pos.x + width) + 1, rect.getHeight(), backColor); // Right rect.getX2() - (pos.x + width) + 1,
port->drawFilledRect(pos.x, rect.getY(), rect.getHeight(), backColor);
width, pos.y - rect.getY(), backColor); // Top
port->drawFilledRect(pos.x, pos.y + height, // Top
width, rect.getY2() - (pos.y + height) + 1, backColor); // Bottom
port->drawFilledRect(pos.x, rect.getY(), width, pos.y - rect.getY(),
backColor);
// Bottom
port->drawFilledRect(pos.x, pos.y + height, width,
rect.getY2() - (pos.y + height) + 1, backColor);
#endif #endif
// Add the text using the selected color and background color // Add the text using the selected color and background color
@ -350,7 +361,7 @@ void CLabel::drawContents(CGraphicsPort *port)
void CLabel::drawBorder(CGraphicsPort *port) void CLabel::drawBorder(CGraphicsPort *port)
{ {
// Check if the widget indicates it should have an outline: That // Check if the widget indicates it should have an outline: That
// the outline is enabled and the this is not just a text-only // (1) the outline is enabled and (2) that this is not just a text-only
// redraw // redraw
if (!isBorderless() && !isTextChange()) if (!isBorderless() && !isTextChange())

9
libnxwidgets/src/cnxwidget.cxx
View File

@ -172,7 +172,6 @@ CNxWidget::CNxWidget(CWidgetControl *pWidgetControl,
m_flags.drawingEnabled = false; m_flags.drawingEnabled = false;
m_flags.enabled = true; m_flags.enabled = true;
m_flags.erased = true; m_flags.erased = true;
m_flags.visibleRegionCacheInvalid = true;
m_flags.hidden = false; m_flags.hidden = false;
// Set hierarchy pointers // Set hierarchy pointers
@ -329,14 +328,16 @@ bool CNxWidget::isDrawingEnabled(void) const
{ {
if (m_parent->isDrawingEnabled()) if (m_parent->isDrawingEnabled())
{ {
// Drawing is enabled if the widget is drawable and not deleted // Drawing is enabled if the widget is drawable, not deleted, and not hidden
return (m_flags.drawingEnabled && (!m_flags.deleted) && (!m_flags.hidden)); return (m_flags.drawingEnabled && !m_flags.deleted && !m_flags.hidden);
} }
} }
else else
{ {
return (m_flags.drawingEnabled && (!m_flags.deleted) && (!m_flags.hidden)); // Drawing is enabled if the widget is drawable, not deleted, and not hidden
return (m_flags.drawingEnabled && !m_flags.deleted && !m_flags.hidden);
} }
return false; return false;