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

NxWM::CApplicationWindow: Created the custom font for the toolbar title, but never used it.

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-17 13:38:37 -06:00
parent f62f6b33f3
commit 1db74a3494
5 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnxwidgets/include/clabel.hxx
View File

@ -333,6 +333,8 @@ namespace NXWidgets
* Sets the font. * Sets the font.
* *
* @param font A pointer to the font to use. * @param font A pointer to the font to use.
*
* NOTE: This font is not deleted when the widget is destroyed!
*/ */
virtual void setFont(CNxFont *font); virtual void setFont(CNxFont *font);

2
libnxwidgets/include/cnxwidget.hxx
View File

@ -1012,6 +1012,8 @@ namespace NXWidgets
* Sets the font. * Sets the font.
* *
* @param font A pointer to the font to use. * @param font A pointer to the font to use.
*
* NOTE: This font is not deleted when the widget is destroyed!
*/ */
virtual void setFont(CNxFont *font); virtual void setFont(CNxFont *font);

2
libnxwidgets/src/clabel.cxx
View File

@ -252,6 +252,8 @@ void CLabel::getPreferredDimensions(CRect &rect) const
* Sets the font. * Sets the font.
* *
* @param font A pointer to the font to use. * @param font A pointer to the font to use.
*
* NOTE: This font is not deleted when the widget is destroyed!
*/ */
void CLabel::setFont(CNxFont *font) void CLabel::setFont(CNxFont *font)

3
libnxwidgets/src/cnxwidget.cxx
View File

@ -466,6 +466,8 @@ void CNxWidget::setBorderless(bool borderless)
* Sets the font. * Sets the font.
* *
* @param font A pointer to the font to use. * @param font A pointer to the font to use.
*
* NOTE: This font is not deleted when the widget is destroyed!
*/ */
void CNxWidget::setFont(CNxFont *font) void CNxWidget::setFont(CNxFont *font)
@ -1408,6 +1410,7 @@ const CNxWidget *CNxWidget::getChild(int index) const
{ {
return m_children[index]; return m_children[index];
} }
return (CNxWidget *)NULL; return (CNxWidget *)NULL;
} }

1
nxwm/src/capplicationwindow.cxx
View File

@ -334,6 +334,7 @@ bool CApplicationWindow::open(void)
// Configure the label // Configure the label
m_windowLabel->setFont(m_windowFont);
m_windowLabel->setBorderless(true); m_windowLabel->setBorderless(true);
m_windowLabel->setTextAlignmentHoriz(NXWidgets::CLabel::TEXT_ALIGNMENT_HORIZ_LEFT); m_windowLabel->setTextAlignmentHoriz(NXWidgets::CLabel::TEXT_ALIGNMENT_HORIZ_LEFT);
m_windowLabel->setTextAlignmentVert(NXWidgets::CLabel::TEXT_ALIGNMENT_VERT_CENTER); m_windowLabel->setTextAlignmentVert(NXWidgets::CLabel::TEXT_ALIGNMENT_VERT_CENTER);