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

libnxwidgets: In NxWidgets::CText, allow setting negative line spacing. This is useful to have text take up less space, as quite many fonts have large line spacings built-in.

Browse Source
This commit is contained in:
Petteri Aimonen 2016-09-22 12:11:32 -06:00 committed by Gregory Nutt
parent a910c967ba
commit 9a85276218
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnxwidgets/include/ctext.hxx
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* NxWidgets/libnxwidgets/include/ctext.hxx * NxWidgets/libnxwidgets/include/ctext.hxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -126,7 +126,7 @@ namespace NXWidgets
TNxArray<LongestLine> m_longestLines; /**< Array containing data describing TNxArray<LongestLine> m_longestLines; /**< Array containing data describing
successively longer wrapped successively longer wrapped
lines */ lines */
uint8_t m_lineSpacing; /**< Spacing between lines of text */ nxgl_coord_t m_lineSpacing; /**< Spacing between lines of text */
int32_t m_textPixelHeight; /**< Total height of the wrapped int32_t m_textPixelHeight; /**< Total height of the wrapped
text in pixels */ text in pixels */
uint8_t m_textPixelWidth; /**< Total width of the wrapped text uint8_t m_textPixelWidth; /**< Total width of the wrapped text
@ -216,7 +216,7 @@ namespace NXWidgets
* @param lineSpacing The line spacing. * @param lineSpacing The line spacing.
*/ */
void setLineSpacing(uint8_t lineSpacing); void setLineSpacing(nxgl_coord_t lineSpacing);
/** /**
* Sets the pixel width of the text; text wider than * Sets the pixel width of the text; text wider than

4
libnxwidgets/src/ctext.cxx
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* NxWidgets/libnxwidgets/src/ctext.cxx * NxWidgets/libnxwidgets/src/ctext.cxx
* *
* Copyright (C) 2012 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -199,7 +199,7 @@ void CText::remove(const int startIndex, const int count)
* @param lineSpacing The line spacing. * @param lineSpacing The line spacing.
*/ */
void CText::setLineSpacing(uint8_t lineSpacing) void CText::setLineSpacing(nxgl_coord_t lineSpacing)
{ {
m_lineSpacing = lineSpacing; m_lineSpacing = lineSpacing;
wrap(); wrap();