diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-01-19 13:40:51 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-01-19 13:40:51 +0100 |
| commit | f14d7f0e549c320c2a954dc4c503055855170162 (patch) | |
| tree | 326f81acfb82ff6fb1ca14a95f2cf6021b99afc7 /lib/gui | |
| parent | a2f2b1a1523b784e70cf3bd9a74b4cc5cfdbb3de (diff) | |
| download | enigma2-f14d7f0e549c320c2a954dc4c503055855170162.tar.gz enigma2-f14d7f0e549c320c2a954dc4c503055855170162.zip | |
Revert "add orBottomToTop, orRightToLeft, orLeftToRight(orHorizontal), orTopToBottom(OrVertical) to eSlider"
This reverts commit 2e02d72e10207215592e4aeda8b1c5cf18f7115a.
Diffstat (limited to 'lib/gui')
| -rw-r--r-- | lib/gui/eslider.cpp | 21 | ||||
| -rw-r--r-- | lib/gui/eslider.h | 4 |
2 files changed, 4 insertions, 21 deletions
diff --git a/lib/gui/eslider.cpp b/lib/gui/eslider.cpp index 00aaeb74..dd2aac9e 100644 --- a/lib/gui/eslider.cpp +++ b/lib/gui/eslider.cpp @@ -1,8 +1,7 @@ #include <lib/gui/eslider.h> eSlider::eSlider(eWidget *parent) - :eWidget(parent), m_have_border_color(false), m_start(0) - ,m_orientation(orHorizontal), m_direction(dirNormal), m_border_width(0) + :eWidget(parent), m_have_border_color(false), m_start(0), m_orientation(orHorizontal), m_border_width(0) { } @@ -71,16 +70,8 @@ int eSlider::event(int event, void *data, void *data2) if (m_min < m_max) { - if (m_direction == dirSwapped) - { - start_pix = pixsize * (m_start + (m_max - m_min) - m_value) / (m_max - m_min); - num_pix = pixsize * (m_start + (m_max - m_min)) / (m_max - m_min); - } - else // dirNormal - { - num_pix = pixsize * (m_value - m_start) / (m_max - m_min); - start_pix = pixsize * m_start / (m_max - m_min); - } + num_pix = pixsize * (m_value - m_start) / (m_max - m_min); + start_pix = pixsize * m_start / (m_max - m_min); } if (start_pix < 0) @@ -128,12 +119,6 @@ void eSlider::setOrientation(int orientation) event(evtChangedSlider); } -void eSlider::setDirection(int direction) -{ - m_direction = direction; - event(evtChangedSlider); -} - void eSlider::setRange(int min, int max) { m_min = min; diff --git a/lib/gui/eslider.h b/lib/gui/eslider.h index 47941eda..c5440726 100644 --- a/lib/gui/eslider.h +++ b/lib/gui/eslider.h @@ -11,11 +11,9 @@ public: void setStartEnd(int start, int end); void setRange(int min, int max); enum { orHorizontal, orVertical }; - enum { dirNormal, dirSwapped }; void setOrientation(int orientation); void setBorderWidth(int pixel); void setBorderColor(const gRGB &color); - void setDirection(int direction); void setPixmap(gPixmap *pixmap); void setPixmap(ePtr<gPixmap> &pixmap); protected: @@ -26,7 +24,7 @@ private: evtChangedSlider = evtUserWidget }; bool m_have_border_color; - int m_min, m_max, m_value, m_start, m_orientation, m_direction, m_border_width; + int m_min, m_max, m_value, m_start, m_orientation, m_border_width; ePtr<gPixmap> m_pixmap; gRegion m_currently_filled; |
