diff options
| author | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-19 22:17:28 +0200 |
|---|---|---|
| committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-19 22:17:28 +0200 |
| commit | 57d33d79ea570773d84ad81d4a61f50e079979ef (patch) | |
| tree | 562be3e3ee4a5650fc990baee6403c911ea6f89f /src/ui/slider.cpp | |
| parent | 1a79137e904eb07c17df2596e6b8aa9310ff22bd (diff) | |
| download | colobot-57d33d79ea570773d84ad81d4a61f50e079979ef.tar.gz colobot-57d33d79ea570773d84ad81d4a61f50e079979ef.tar.bz2 colobot-57d33d79ea570773d84ad81d4a61f50e079979ef.zip | |
Changes in Ui, solves part of #47
Diffstat (limited to 'src/ui/slider.cpp')
| -rw-r--r-- | src/ui/slider.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/slider.cpp b/src/ui/slider.cpp index 175a6fe..70dd2cc 100644 --- a/src/ui/slider.cpp +++ b/src/ui/slider.cpp @@ -288,20 +288,20 @@ bool CSlider::EventProcess(const Event &event) (m_state & STATE_VISIBLE) && (m_state & STATE_ENABLE) ) { - if ( CControl::Detect(event.pos) ) + if ( CControl::Detect(event.mouseButton.pos) ) { if ( m_bHoriz ) { pos.x = m_pos.x+m_marginButton; dim.x = m_dim.x-m_marginButton*2.0f; - value = (event.pos.x-pos.x-CURSOR_WIDTH/2.0f); + value = (event.mouseButton.pos.x-pos.x-CURSOR_WIDTH/2.0f); value /= (dim.x-CURSOR_WIDTH); } else { pos.y = m_pos.y+m_marginButton; dim.y = m_dim.y-m_marginButton*2.0f; - value = (event.pos.y-pos.y-CURSOR_WIDTH/2.0f); + value = (event.mouseButton.pos.y-pos.y-CURSOR_WIDTH/2.0f); value /= (dim.y-CURSOR_WIDTH); } if ( value < 0.0f ) value = 0.0f; @@ -314,7 +314,7 @@ bool CSlider::EventProcess(const Event &event) m_event->AddEvent(newEvent); m_bCapture = true; - m_pressPos = event.pos; + m_pressPos = event.mouseButton.pos; m_pressValue = m_visibleValue; } } @@ -325,14 +325,14 @@ bool CSlider::EventProcess(const Event &event) { pos.x = m_pos.x+m_marginButton; dim.x = m_dim.x-m_marginButton*2.0f; - value = (event.pos.x-pos.x-CURSOR_WIDTH/2.0f); + value = (event.mouseMove.pos.x-pos.x-CURSOR_WIDTH/2.0f); value /= (dim.x-CURSOR_WIDTH); } else { pos.y = m_pos.y+m_marginButton; dim.y = m_dim.y-m_marginButton*2.0f; - value = (event.pos.y-pos.y-CURSOR_WIDTH/2.0f); + value = (event.mouseMove.pos.y-pos.y-CURSOR_WIDTH/2.0f); value /= (dim.y-CURSOR_WIDTH); } if ( value < 0.0f ) value = 0.0f; |