Просмотр исходного кода

Allowing containers and sliders to consume touch events.

Adam Blake 14 лет назад
Родитель
Сommit
b085a534bb
2 измененных файлов с 3 добавлено и 5 удалено
  1. 2 2
      gameplay/src/Container.cpp
  2. 1 3
      gameplay/src/Slider.cpp

+ 2 - 2
gameplay/src/Container.cpp

@@ -320,7 +320,7 @@ namespace gameplay
 
         if (!isEnabled())
         {
-            return (_consumeTouchEvents & eventConsumed);
+            return (_consumeTouchEvents | eventConsumed);
         }
 
         switch (evt)
@@ -333,7 +333,7 @@ namespace gameplay
             break;
         }
 
-        return (_consumeTouchEvents & eventConsumed);
+        return (_consumeTouchEvents | eventConsumed);
     }
 
     void Container::keyEvent(Keyboard::KeyEvent evt, int key)

+ 1 - 3
gameplay/src/Slider.cpp

@@ -71,8 +71,6 @@ bool Slider::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contac
         return false;
     }
 
-    bool consumeEvent = false;
-
     switch (evt)
     {
     case Touch::TOUCH_PRESS:
@@ -132,7 +130,7 @@ bool Slider::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contac
         }
     }
 
-    return consumeEvent;
+    return _consumeTouchEvents;
 }
 
 void Slider::drawSprites(SpriteBatch* spriteBatch, const Rectangle& clip)