summaryrefslogtreecommitdiff
path: root/NxWidgets/libnxwidgets
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-07-16 11:11:55 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-07-16 11:11:55 -0600
commit789172023edd1e4d082824983cb4ac8c59d00b95 (patch)
treee8d88c24026c15cd19094464bffc823e19407480 /NxWidgets/libnxwidgets
parent8e932634ac53d6ac42d60d805ccee4e2e285aa72 (diff)
downloadnuttx-789172023edd1e4d082824983cb4ac8c59d00b95.tar.gz
nuttx-789172023edd1e4d082824983cb4ac8c59d00b95.tar.bz2
nuttx-789172023edd1e4d082824983cb4ac8c59d00b95.zip
NxWM::CMediaPlayer: Fix of state related bugs + Size if CLabel is increased (in preparation for becoming a CListBox)
Diffstat (limited to 'NxWidgets/libnxwidgets')
-rw-r--r--NxWidgets/libnxwidgets/include/cimage.hxx5
-rw-r--r--NxWidgets/libnxwidgets/include/cscaledbitmap.hxx4
-rw-r--r--NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx14
-rw-r--r--NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx12
-rw-r--r--NxWidgets/libnxwidgets/include/csliderhorizontal.hxx22
-rw-r--r--NxWidgets/libnxwidgets/include/cslidervertical.hxx22
-rw-r--r--NxWidgets/libnxwidgets/include/islider.hxx14
-rw-r--r--NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx13
-rw-r--r--NxWidgets/libnxwidgets/src/cscaledbitmap.cxx2
-rw-r--r--NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx14
-rw-r--r--NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx16
-rw-r--r--NxWidgets/libnxwidgets/src/csliderhorizontal.cxx4
-rw-r--r--NxWidgets/libnxwidgets/src/cslidervertical.cxx4
13 files changed, 74 insertions, 72 deletions
diff --git a/NxWidgets/libnxwidgets/include/cimage.hxx b/NxWidgets/libnxwidgets/include/cimage.hxx
index e485f6d9d..ee72617ac 100644
--- a/NxWidgets/libnxwidgets/include/cimage.hxx
+++ b/NxWidgets/libnxwidgets/include/cimage.hxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/include/cimage.hxx
*
- * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -218,6 +218,9 @@ namespace NXWidgets
/**
* Destructor.
+ *
+ * NOTE: That the contained bitmap image is not destroyed when the image
+ * container is destroyed.
*/
virtual inline ~CImage() { }
diff --git a/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx b/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx
index 8cb25ae75..e6944ad4c 100644
--- a/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx
+++ b/NxWidgets/libnxwidgets/include/cscaledbitmap.hxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/include/cscaledbitmap.hxx
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -75,7 +75,7 @@ namespace NXWidgets
FAR IBitmap *m_bitmap; /**< The bitmap that is being scaled */
struct nxgl_size_s m_size; /**< Scaled size of the image */
FAR uint8_t *m_rowCache[2]; /**< Two cached rows of the image */
- int m_row; /**< Row number of the first cached row */
+ unsigned int m_row; /**< Row number of the first cached row */
b16_t m_xScale; /**< X scale factor */
b16_t m_yScale; /**< Y scale factor */
diff --git a/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx b/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx
index f6c3be3c3..65ab5b416 100644
--- a/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx
+++ b/NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -171,7 +171,7 @@ namespace NXWidgets
* @return The smallest value.
*/
- const nxgl_coord_t getMinimumValue(void) const;
+ const int getMinimumValue(void) const;
/**
* Get the largest value that the slider can represent.
@@ -179,7 +179,7 @@ namespace NXWidgets
* @return The largest value.
*/
- const nxgl_coord_t getMaximumValue(void) const;
+ const int getMaximumValue(void) const;
/**
* Get the current value of the slider.
@@ -187,7 +187,7 @@ namespace NXWidgets
* @return The current slider value.
*/
- const nxgl_coord_t getValue(void) const;
+ const int getValue(void) const;
/**
* Get the value represented by the height of the grip.
@@ -206,7 +206,7 @@ namespace NXWidgets
* @param value The smallest value.
*/
- void setMinimumValue(const nxgl_coord_t value);
+ void setMinimumValue(const int value);
/**
* Set the largest value that the slider can represent.
@@ -214,7 +214,7 @@ namespace NXWidgets
* @param value The largest value.
*/
- void setMaximumValue(const nxgl_coord_t value);
+ void setMaximumValue(const int value);
/**
* Set the value that of the slider. This will reposition
@@ -223,7 +223,7 @@ namespace NXWidgets
* @param value The new value.
*/
- void setValue(const nxgl_coord_t value);
+ void setValue(const int value);
/**
* Set the value that of the slider. This will reposition and redraw
diff --git a/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx b/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx
index 37649e970..47c0cc260 100644
--- a/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx
+++ b/NxWidgets/libnxwidgets/include/cscrollbarvertical.hxx
@@ -170,7 +170,7 @@ namespace NXWidgets
* @return The smallest value.
*/
- const nxgl_coord_t getMinimumValue(void) const;
+ const int getMinimumValue(void) const;
/**
* Get the largest value that the slider can represent.
@@ -178,7 +178,7 @@ namespace NXWidgets
* @return The largest value.
*/
- const nxgl_coord_t getMaximumValue(void) const;
+ const int getMaximumValue(void) const;
/**
* Get the current value of the slider.
@@ -186,7 +186,7 @@ namespace NXWidgets
* @return The current slider value.
*/
- const nxgl_coord_t getValue(void) const;
+ const int getValue(void) const;
/**
* Get the value represented by the height of the grip.
@@ -205,7 +205,7 @@ namespace NXWidgets
* @param value The smallest value.
*/
- void setMinimumValue(const nxgl_coord_t value);
+ void setMinimumValue(const int value);
/**
* Set the largest value that the slider can represent.
@@ -213,7 +213,7 @@ namespace NXWidgets
* @param value The largest value.
*/
- void setMaximumValue(const nxgl_coord_t value);
+ void setMaximumValue(const int value);
/**
* Set the value that of the slider. This will reposition
@@ -222,7 +222,7 @@ namespace NXWidgets
* @param value The new value.
*/
- void setValue(const nxgl_coord_t value);
+ void setValue(const int value);
/**
* Set the value that of the slider. This will reposition and redraw
diff --git a/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx b/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx
index ea0c8dc18..dd03203e1 100644
--- a/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx
+++ b/NxWidgets/libnxwidgets/include/csliderhorizontal.hxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/include/csliderhorizontal.hxx
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -110,8 +110,8 @@ namespace NXWidgets
{
protected:
CSliderHorizontalGrip *m_grip; /**< Pointer to the grip. */
- nxgl_coord_t m_minimumValue; /**< Minimum value that the grip can represent. */
- nxgl_coord_t m_maximumValue; /**< Maximum value that the grip can represent. */
+ int m_minimumValue; /**< Minimum value that the grip can represent. */
+ int m_maximumValue; /**< Maximum value that the grip can represent. */
int32_t m_value; /**< Current value of the slider. */
nxgl_coord_t m_minimumGripWidth; /**< Smallest width that the grip can become */
nxgl_coord_t m_pageSize; /**< Value of a page of data, used when clicking
@@ -124,7 +124,7 @@ namespace NXWidgets
* Get the maximum possible value that the slider can represent. Useful when
* using the slider as a scrollbar, as the height of the grip prevents the full
* range of values being accessed (intentionally).
- * The returned value is bitshfted left 16 places for more accuracy in fixed-point
+ * The returned value is shifted left 16 places for more accuracy in fixed-point
* calculations.
*
* @return The maximum possible value that the slider can represent.
@@ -218,7 +218,7 @@ namespace NXWidgets
* @return The smallest value.
*/
- inline const nxgl_coord_t getMinimumValue(void) const
+ inline const int getMinimumValue(void) const
{
return m_minimumValue;
}
@@ -229,7 +229,7 @@ namespace NXWidgets
* @return The largest value.
*/
- inline const nxgl_coord_t getMaximumValue(void) const
+ inline const int getMaximumValue(void) const
{
return m_maximumValue;
}
@@ -240,7 +240,7 @@ namespace NXWidgets
* return The current slider value.
*/
- inline const nxgl_coord_t getValue(void) const
+ inline const int getValue(void) const
{
return m_value >> 16;
}
@@ -265,7 +265,7 @@ namespace NXWidgets
* @param value The smallest value.
*/
- inline void setMinimumValue(const nxgl_coord_t value)
+ inline void setMinimumValue(const int value)
{
m_minimumValue = value;
m_contentSize = m_maximumValue - m_minimumValue + 1;
@@ -278,7 +278,7 @@ namespace NXWidgets
* @param value The largest value.
*/
- inline void setMaximumValue(const nxgl_coord_t value)
+ inline void setMaximumValue(const int value)
{
m_maximumValue = value;
m_contentSize = m_maximumValue - m_minimumValue + 1;
@@ -292,11 +292,11 @@ namespace NXWidgets
* @param value The new value.
*/
- void setValue(const nxgl_coord_t value);
+ void setValue(const int value);
/**
* Set the value that of the slider. This will reposition and redraw
- * the grip. The supplied value should be bitshifted left 16 places.
+ * the grip. The supplied value should be shifted left 16 places.
* This ensures greater accuracy than the standard setValue() method if
* the slider is being used as a scrollbar.
*
diff --git a/NxWidgets/libnxwidgets/include/cslidervertical.hxx b/NxWidgets/libnxwidgets/include/cslidervertical.hxx
index f08010f3c..a63611823 100644
--- a/NxWidgets/libnxwidgets/include/cslidervertical.hxx
+++ b/NxWidgets/libnxwidgets/include/cslidervertical.hxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/include/cslidervertical.hxx
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -110,8 +110,8 @@ namespace NXWidgets
{
protected:
CSliderVerticalGrip* m_grip; /**< Pointer to the grip. */
- nxgl_coord_t m_minimumValue; /**< Minimum value that the grip can represent. */
- nxgl_coord_t m_maximumValue; /**< Maximum value that the grip can represent. */
+ int m_minimumValue; /**< Minimum value that the grip can represent. */
+ int m_maximumValue; /**< Maximum value that the grip can represent. */
int32_t m_value; /**< Current value of the slider. */
nxgl_coord_t m_minimumGripHeight; /**< Smallest height that the grip can become. */
nxgl_coord_t m_pageSize; /**< Value of a page of data, used when clicking
@@ -124,7 +124,7 @@ namespace NXWidgets
* Get the maximum possible value that the slider can represent. Useful when
* using the slider as a scrollbar, as the height of the grip prevents the full
* range of values being accessed (intentionally).
- * The returned value is bitshfted left 16 places for more accuracy in fixed-point
+ * The returned value is shifted left 16 places for more accuracy in fixed-point
* calculations.
*
* @return The maximum possible value that the slider can represent.
@@ -219,7 +219,7 @@ namespace NXWidgets
* @return The smallest value.
*/
- inline const nxgl_coord_t getMinimumValue(void) const
+ inline const int getMinimumValue(void) const
{
return m_minimumValue;
}
@@ -230,7 +230,7 @@ namespace NXWidgets
* @return The largest value.
*/
- inline const nxgl_coord_t getMaximumValue(void) const
+ inline const int getMaximumValue(void) const
{
return m_maximumValue;
}
@@ -240,7 +240,7 @@ namespace NXWidgets
* return The current slider value.
*/
- inline const nxgl_coord_t getValue(void) const
+ inline const int getValue(void) const
{
return m_value >> 16;
}
@@ -265,7 +265,7 @@ namespace NXWidgets
* @param value The smallest value.
*/
- inline void setMinimumValue(const nxgl_coord_t value)
+ inline void setMinimumValue(const int value)
{
m_minimumValue = value;
m_contentSize = m_maximumValue - m_minimumValue + 1;
@@ -278,7 +278,7 @@ namespace NXWidgets
* @param value The largest value.
*/
- inline void setMaximumValue(const nxgl_coord_t value)
+ inline void setMaximumValue(const int value)
{
m_maximumValue = value;
m_contentSize = m_maximumValue - m_minimumValue + 1;
@@ -292,11 +292,11 @@ namespace NXWidgets
* @param value The new value.
*/
- void setValue(const nxgl_coord_t value);
+ void setValue(const int value);
/**
* Set the value that of the slider. This will reposition and redraw
- * the grip. The supplied value should be bitshifted left 16 places.
+ * the grip. The supplied value should be shifted left 16 places.
* This ensures greater accuracy than the standard setValue() method if
* the slider is being used as a scrollbar.
*
diff --git a/NxWidgets/libnxwidgets/include/islider.hxx b/NxWidgets/libnxwidgets/include/islider.hxx
index 1577e9898..1069c5bd1 100644
--- a/NxWidgets/libnxwidgets/include/islider.hxx
+++ b/NxWidgets/libnxwidgets/include/islider.hxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/include/islider.hxx
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -114,7 +114,7 @@ namespace NXWidgets
* @return The smallest value.
*/
- virtual const nxgl_coord_t getMinimumValue(void) const = 0;
+ virtual const int getMinimumValue(void) const = 0;
/**
* Get the largest value that the slider can represent.
@@ -122,7 +122,7 @@ namespace NXWidgets
* @return The largest value.
*/
- virtual const nxgl_coord_t getMaximumValue(void) const = 0;
+ virtual const int getMaximumValue(void) const = 0;
/**
* Get the current value of the slider.
@@ -130,7 +130,7 @@ namespace NXWidgets
* return The current slider value.
*/
- virtual const nxgl_coord_t getValue(void) const = 0;
+ virtual const int getValue(void) const = 0;
/**
* Get the value represented by the height of the grip.
@@ -149,7 +149,7 @@ namespace NXWidgets
* @param value The smallest value.
*/
- virtual void setMinimumValue(const nxgl_coord_t value) = 0;
+ virtual void setMinimumValue(const int value) = 0;
/**
* Set the largest value that the slider can represent.
@@ -157,7 +157,7 @@ namespace NXWidgets
* @param value The largest value.
*/
- virtual void setMaximumValue(const nxgl_coord_t value) = 0;
+ virtual void setMaximumValue(const int value) = 0;
/**
* Set the value that of the slider. This will reposition
@@ -166,7 +166,7 @@ namespace NXWidgets
* @param value The new value.
*/
- virtual void setValue(const nxgl_coord_t value) = 0;
+ virtual void setValue(const int value) = 0;
/**
* Set the value that of the slider. This will reposition and redraw
diff --git a/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx b/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx
index 786cbec9f..0430a541f 100644
--- a/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx
+++ b/NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx
@@ -1,4 +1,3 @@
-
/****************************************************************************
* NxWidgets/libnxwidgets/src/cglyphsliderhorizontal.cxx
*
@@ -142,20 +141,19 @@ CGlyphSliderHorizontal::CGlyphSliderHorizontal(CWidgetControl * pWidgetControl,
}
/**
- * Set the value that of the slider. This will reposition
- * and redraw the grip.
+ * Set the value of the slider. This will reposition and redraw the grip.
*
* @param value The new value.
*/
-void CGlyphSliderHorizontal::setValue(const nxgl_coord_t value)
+void CGlyphSliderHorizontal::setValue(const int value)
{
- setValueWithBitshift((int32_t) value << 16);
+ setValueWithBitshift((int32_t)value << 16);
}
/**
* Set the value that of the slider. This will reposition and redraw
- * the grip. The supplied value should be bitshifted left 16 places.
+ * the grip. The supplied value should be shifted left 16 places.
* This ensures greater accuracy than the standard setValue() method if
* the slider is being used as a scrollbar.
*
@@ -260,7 +258,7 @@ nxgl_coord_t CGlyphSliderHorizontal::getMinimumStep(void) const
* Get the maximum possible value that the slider can represent. Useful when
* using the slider as a scrollbar, as the height of the grip prevents the full
* range of values being accessed (intentionally).
- * The returned value is bitshfted left 16 places for more accuracy in fixed-point
+ * The returned value is shifted left 16 places for more accuracy in fixed-point
* calculations.
*
* @return The maximum possible value that the slider can represent.
@@ -499,5 +497,6 @@ void CGlyphSliderHorizontal::onClick(nxgl_coord_t x, nxgl_coord_t y)
setValueWithBitshift(m_value - (m_pageSize << 16));
}
+
redraw();
}
diff --git a/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx b/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx
index ad0bd1953..eb8217434 100644
--- a/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx
+++ b/NxWidgets/libnxwidgets/src/cscaledbitmap.cxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/src/cscaledbitmap.hxx
*
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
diff --git a/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx b/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx
index 236ab4594..90c28d2d4 100644
--- a/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx
+++ b/NxWidgets/libnxwidgets/src/cscrollbarhorizontal.cxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -162,7 +162,7 @@ CScrollbarHorizontal::CScrollbarHorizontal(CWidgetControl *pWidgetControl,
* @return The smallest value.
*/
-const nxgl_coord_t CScrollbarHorizontal::getMinimumValue(void) const
+const int CScrollbarHorizontal::getMinimumValue(void) const
{
return m_slider->getMinimumValue();
}
@@ -173,7 +173,7 @@ const nxgl_coord_t CScrollbarHorizontal::getMinimumValue(void) const
* @return The largest value.
*/
-const nxgl_coord_t CScrollbarHorizontal::getMaximumValue(void) const
+const int CScrollbarHorizontal::getMaximumValue(void) const
{
return m_slider->getMaximumValue();
}
@@ -184,7 +184,7 @@ const nxgl_coord_t CScrollbarHorizontal::getMaximumValue(void) const
* @return The current slider value.
*/
-const nxgl_coord_t CScrollbarHorizontal::getValue(void) const
+const int CScrollbarHorizontal::getValue(void) const
{
return m_slider->getValue();
}
@@ -209,7 +209,7 @@ const nxgl_coord_t CScrollbarHorizontal::getPageSize(void) const
* @param value The smallest value.
*/
-void CScrollbarHorizontal::setMinimumValue(const nxgl_coord_t value)
+void CScrollbarHorizontal::setMinimumValue(const int value)
{
m_slider->setMinimumValue(value);
}
@@ -220,7 +220,7 @@ void CScrollbarHorizontal::setMinimumValue(const nxgl_coord_t value)
* @param value The largest value.
*/
-void CScrollbarHorizontal::setMaximumValue(const nxgl_coord_t value)
+void CScrollbarHorizontal::setMaximumValue(const int value)
{
m_slider->setMaximumValue(value);
}
@@ -232,7 +232,7 @@ void CScrollbarHorizontal::setMaximumValue(const nxgl_coord_t value)
* @param value The new value.
*/
-void CScrollbarHorizontal::setValue(const nxgl_coord_t value)
+void CScrollbarHorizontal::setValue(const int value)
{
m_slider->setValue(value);
}
diff --git a/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx b/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx
index e287b14f2..307f6bc2a 100644
--- a/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx
+++ b/NxWidgets/libnxwidgets/src/cscrollbarvertical.cxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/include/cscrollbarhorizontal.hxx
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -160,7 +160,7 @@ CScrollbarVertical::CScrollbarVertical(CWidgetControl *pWidgetControl,
* @return The smallest value.
*/
-const nxgl_coord_t CScrollbarVertical::getMinimumValue(void) const
+const int CScrollbarVertical::getMinimumValue(void) const
{
return m_slider->getMinimumValue();
}
@@ -171,7 +171,7 @@ const nxgl_coord_t CScrollbarVertical::getMinimumValue(void) const
* @return The largest value.
*/
-const nxgl_coord_t CScrollbarVertical::getMaximumValue(void) const
+const int CScrollbarVertical::getMaximumValue(void) const
{
return m_slider->getMaximumValue();
}
@@ -182,7 +182,7 @@ const nxgl_coord_t CScrollbarVertical::getMaximumValue(void) const
* @return The current slider value.
*/
-const nxgl_coord_t CScrollbarVertical::getValue(void) const
+const int CScrollbarVertical::getValue(void) const
{
return m_slider->getValue();
}
@@ -207,7 +207,7 @@ const nxgl_coord_t CScrollbarVertical::getPageSize(void) const
* @param value The smallest value.
*/
-void CScrollbarVertical::setMinimumValue(const nxgl_coord_t value)
+void CScrollbarVertical::setMinimumValue(const int value)
{
m_slider->setMinimumValue(value);
}
@@ -218,7 +218,7 @@ void CScrollbarVertical::setMinimumValue(const nxgl_coord_t value)
* @param value The largest value.
*/
-void CScrollbarVertical::setMaximumValue(const nxgl_coord_t value)
+void CScrollbarVertical::setMaximumValue(const int value)
{
m_slider->setMaximumValue(value);
}
@@ -230,7 +230,7 @@ void CScrollbarVertical::setMaximumValue(const nxgl_coord_t value)
* @param value The new value.
*/
-void CScrollbarVertical::setValue(const nxgl_coord_t value)
+void CScrollbarVertical::setValue(const int value)
{
m_slider->setValue(value);
}
@@ -381,7 +381,7 @@ void CScrollbarVertical::onResize(nxgl_coord_t width, nxgl_coord_t height)
{
// Remember current values
- nxgl_coord_t value = getValue();
+ int value = getValue();
bool events = raisesEvents();
// Disable event raising
diff --git a/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx b/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx
index 4462d6e74..b1444828b 100644
--- a/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx
+++ b/NxWidgets/libnxwidgets/src/csliderhorizontal.cxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/src/csliderhorizontal.cxx
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -137,7 +137,7 @@ CSliderHorizontal::CSliderHorizontal(CWidgetControl *pWidgetControl,
* @param value The new value.
*/
-void CSliderHorizontal::setValue(const nxgl_coord_t value)
+void CSliderHorizontal::setValue(const int value)
{
setValueWithBitshift((int32_t)value << 16);
}
diff --git a/NxWidgets/libnxwidgets/src/cslidervertical.cxx b/NxWidgets/libnxwidgets/src/cslidervertical.cxx
index 9b9b0f91a..a9f40a68c 100644
--- a/NxWidgets/libnxwidgets/src/cslidervertical.cxx
+++ b/NxWidgets/libnxwidgets/src/cslidervertical.cxx
@@ -1,7 +1,7 @@
/****************************************************************************
* NxWidgets/libnxwidgets/src/cslidervertical.cxx
*
- * Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -138,7 +138,7 @@ CSliderVertical::CSliderVertical(CWidgetControl *pWidgetControl,
* @param value The new value.
*/
-void CSliderVertical::setValue(const nxgl_coord_t value)
+void CSliderVertical::setValue(const int value)
{
setValueWithBitshift((int32_t)value << 16);
}