git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_321_fix_rotor_turning_after_leave_positioner_setup' into experimental
[enigma2.git]
/
lib
/
gui
/
eslider.h
diff --git
a/lib/gui/eslider.h
b/lib/gui/eslider.h
index 5dcad3dbc7e2474c81e820a8f45fe0d05e294f67..9a3e8395ca4809e73e2147bf3dd0d2c00eefaf3a 100644
(file)
--- a/
lib/gui/eslider.h
+++ b/
lib/gui/eslider.h
@@
-11,7
+11,11
@@
public:
void setStartEnd(int start, int end);
void setRange(int min, int max);
enum { orHorizontal, orVertical };
void setStartEnd(int start, int end);
void setRange(int min, int max);
enum { orHorizontal, orVertical };
- void setOrientation(int orientation);
+ void setOrientation(int orientation, int swapped = 0);
+ void setBorderWidth(int pixel);
+ void setBorderColor(const gRGB &color);
+ void setPixmap(gPixmap *pixmap);
+ void setPixmap(ePtr<gPixmap> &pixmap);
protected:
int event(int event, void *data=0, void *data2=0);
private:
protected:
int event(int event, void *data=0, void *data2=0);
private:
@@
-19,9
+23,12
@@
private:
{
evtChangedSlider = evtUserWidget
};
{
evtChangedSlider = evtUserWidget
};
- int m_min, m_max, m_value, m_start, m_orientation;
+ bool m_have_border_color;
+ int m_min, m_max, m_value, m_start, m_orientation, m_orientation_swapped, m_border_width;
+ ePtr<gPixmap> m_pixmap;
gRegion m_currently_filled;
gRegion m_currently_filled;
+ gRGB m_border_color;
};
#endif
};
#endif