From 0ff419560d5a567afaa0294968cc1f5b5e6b597b Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sat, 22 Sep 2012 00:38:17 +0200 Subject: Event fixes & refactoring - added new state tracking to Event - removed old fields from Event - fixed some issues with Events and fps counter --- src/ui/color.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ui/color.cpp') diff --git a/src/ui/color.cpp b/src/ui/color.cpp index 5668519..a727642 100644 --- a/src/ui/color.cpp +++ b/src/ui/color.cpp @@ -105,11 +105,11 @@ bool CColor::EventProcess(const Event &event) } if ( event.type == EVENT_MOUSE_BUTTON_DOWN && - event.mouseButton.button == 1 && + event.mouseButton.button == MOUSE_BUTTON_LEFT && (m_state & STATE_VISIBLE) && (m_state & STATE_ENABLE) ) { - if ( CControl::Detect(event.mouseButton.pos) ) + if ( CControl::Detect(event.mousePos) ) { m_repeat = DELAY1; @@ -120,7 +120,7 @@ bool CColor::EventProcess(const Event &event) } } - if ( event.type == EVENT_MOUSE_BUTTON_UP && event.mouseButton.button == 1) + if ( event.type == EVENT_MOUSE_BUTTON_UP && event.mouseButton.button == MOUSE_BUTTON_LEFT) { m_repeat = 0.0f; } -- cgit v1.2.3-1-g7c22