Преглед изворни кода

Merge pull request #153 from andrewpeterkort/master

Bounds for Tree Inspector Wheel Added
Denis Muratshin пре 6 година
родитељ
комит
35de4429ab
1 измењених фајлова са 9 додато и 4 уклоњено
  1. 9 4
      oxygine/src/oxygine/dev_tools/TreeInspector.cpp

+ 9 - 4
oxygine/src/oxygine/dev_tools/TreeInspector.cpp

@@ -164,10 +164,15 @@ namespace oxygine
     void TreeInspector::wheel(Event* ev)
     void TreeInspector::wheel(Event* ev)
     {
     {
         float y = _rootPage->getY();
         float y = _rootPage->getY();
-        if (ev->type == TouchEvent::WHEEL_DOWN)
-            y -= 10;
-        else
-            y += 10;
+        int pageHeight = _rootPage->getSize().y;
+
+        if (ev->type == TouchEvent::WHEEL_DOWN){
+            if (y > -pageHeight)
+                y -= 10;
+        }else{
+            if (y < 0)
+                y += 10;
+        }
 
 
         _rootPage->setY(y);
         _rootPage->setY(y);
     }
     }