diff options
| -rw-r--r-- | lib/gui/eslider.cpp | 13 | ||||
| -rw-r--r-- | lib/gui/eslider.h | 4 | ||||
| -rw-r--r-- | skin.py | 10 |
3 files changed, 18 insertions, 9 deletions
diff --git a/lib/gui/eslider.cpp b/lib/gui/eslider.cpp index dd2aac9e..c8b467c9 100644 --- a/lib/gui/eslider.cpp +++ b/lib/gui/eslider.cpp @@ -70,10 +70,14 @@ int eSlider::event(int event, void *data, void *data2) if (m_min < m_max) { - num_pix = pixsize * (m_value - m_start) / (m_max - m_min); - start_pix = pixsize * m_start / (m_max - m_min); + int val_range = m_max - m_min; + num_pix = (pixsize * (m_value - m_start) + val_range - 1) / val_range; /* properly round up */ + start_pix = (pixsize * m_start + val_range - 1) / val_range; + + if (m_orientation_swapped) + start_pix = pixsize - num_pix - start_pix; } - + if (start_pix < 0) { num_pix += start_pix; @@ -113,9 +117,10 @@ void eSlider::setStartEnd(int start, int end) event(evtChangedSlider); } -void eSlider::setOrientation(int orientation) +void eSlider::setOrientation(int orientation, int swapped) { m_orientation = orientation; + m_orientation_swapped = swapped; event(evtChangedSlider); } diff --git a/lib/gui/eslider.h b/lib/gui/eslider.h index c5440726..9a3e8395 100644 --- a/lib/gui/eslider.h +++ b/lib/gui/eslider.h @@ -11,7 +11,7 @@ public: 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); @@ -24,7 +24,7 @@ private: evtChangedSlider = evtUserWidget }; bool m_have_border_color; - int m_min, m_max, m_value, m_start, m_orientation, m_border_width; + 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; @@ -145,9 +145,13 @@ def applySingleAttribute(guiObject, desktop, attrib, value, scale = ((1,1),(1,1) }[value]) elif attrib == "orientation": # used by eSlider try: - guiObject.setOrientation( - { "orVertical": guiObject.orVertical, - "orHorizontal": guiObject.orHorizontal + guiObject.setOrientation(* + { "orVertical": (guiObject.orVertical, False), + "orTopToBottom": (guiObject.olVertical, False), + "orBottomToTop": (guiObject.orVertical, True), + "orHorizontal": (guiObject.orHorizontal, False), + "orLeftToRight": (guiObject.orHorizontal, False), + "orRightToRight": (guiObject.orHorizontal, True), }[value]) except KeyError: print "oprientation must be either orVertical or orHorizontal!" |