diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-17 12:12:02 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-17 12:12:02 -0600 |
| commit | 1b928ea22fbe5e63c5fbfd9a9051eb40512a6665 (patch) | |
| tree | bee9856ea642e60a428dca6d2cdf692370b49792 /NxWidgets/libnxwidgets/include | |
| parent | 3898201b9416c1fc1a828270fe8ce12d7861cd71 (diff) | |
| download | nuttx-1b928ea22fbe5e63c5fbfd9a9051eb40512a6665.tar.gz nuttx-1b928ea22fbe5e63c5fbfd9a9051eb40512a6665.tar.bz2 nuttx-1b928ea22fbe5e63c5fbfd9a9051eb40512a6665.zip | |
NxWidgets::CGlyphSliderHorizontal: No longer uses a hard-coded slider height; the slider height is now provided as a parameter, replacing the widget height which is now calculated from the glip image height
Diffstat (limited to 'NxWidgets/libnxwidgets/include')
| -rw-r--r-- | NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx | 11 | ||||
| -rw-r--r-- | NxWidgets/libnxwidgets/include/cnxwidget.hxx | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx b/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx index 354a097ac..6d23237b7 100644 --- a/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx +++ b/NxWidgets/libnxwidgets/include/cglyphsliderhorizontal.hxx @@ -174,16 +174,19 @@ namespace NXWidgets /** * Constructor. * - * @param pWidgetControl The widget control instance for the window. + * @param control The widget control instance for the window. * @param x The x coordinate of the slider, relative to its parent. * @param y The y coordinate of the slider, relative to its parent. * @param width The width of the slider. - * @param height The height of the slider. + * @param thickness The thickness of the slider. + * @param gripBitmap The slider grip image + * @param fillColor The color to use when filling the grip + * @param fill True: The grip will be filled with fillColor */ - CGlyphSliderHorizontal(CWidgetControl *pWidgetControl, + CGlyphSliderHorizontal(CWidgetControl *control, nxgl_coord_t x, nxgl_coord_t y, nxgl_coord_t width, - nxgl_coord_t height, IBitmap *pGripBitmap, + nxgl_coord_t thickness, IBitmap *gripBitmap, nxwidget_pixel_t fillColor, bool fill = true); /** diff --git a/NxWidgets/libnxwidgets/include/cnxwidget.hxx b/NxWidgets/libnxwidgets/include/cnxwidget.hxx index 543c0b24b..a67938d48 100644 --- a/NxWidgets/libnxwidgets/include/cnxwidget.hxx +++ b/NxWidgets/libnxwidgets/include/cnxwidget.hxx @@ -170,7 +170,7 @@ namespace NXWidgets protected: CWidgetControl *m_widgetControl; /**< The controlling widget for the display */ - CRect m_rect; /**< Rectange bounding the widget. */ + CRect m_rect; /**< Rectangle bounding the widget. */ // Dragging variables |