|
@@ -49,6 +49,7 @@ Screen::Screen() : EventDispatcher() {
|
|
|
addChild(rootEntity);
|
|
addChild(rootEntity);
|
|
|
processTouchEventsAsMouse = false;
|
|
processTouchEventsAsMouse = false;
|
|
|
ownsChildren = false;
|
|
ownsChildren = false;
|
|
|
|
|
+ snapToPixelsByDefault = false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Screen::~Screen() {
|
|
Screen::~Screen() {
|
|
@@ -261,7 +262,7 @@ bool Screen::hasFilterShader() const {
|
|
|
return _hasFilterShader;
|
|
return _hasFilterShader;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-ScreenEntity* Screen::addChild(ScreenEntity *newEntity) {
|
|
|
|
|
|
|
+ScreenEntity* Screen::addEntity(ScreenEntity *newEntity) {
|
|
|
if(!newEntity)
|
|
if(!newEntity)
|
|
|
return NULL;
|
|
return NULL;
|
|
|
children.push_back(newEntity);
|
|
children.push_back(newEntity);
|
|
@@ -271,10 +272,16 @@ ScreenEntity* Screen::addChild(ScreenEntity *newEntity) {
|
|
|
newEntity->addEventListener(this, ScreenEvent::ENTITY_MOVE_DOWN);
|
|
newEntity->addEventListener(this, ScreenEvent::ENTITY_MOVE_DOWN);
|
|
|
newEntity->addEventListener(this, ScreenEvent::ENTITY_MOVE_UP);
|
|
newEntity->addEventListener(this, ScreenEvent::ENTITY_MOVE_UP);
|
|
|
newEntity->zindex = getHighestZIndex()+1;
|
|
newEntity->zindex = getHighestZIndex()+1;
|
|
|
|
|
+ newEntity->setDefaultScreenOptions(snapToPixelsByDefault);
|
|
|
|
|
+
|
|
|
sortChildren();
|
|
sortChildren();
|
|
|
return newEntity;
|
|
return newEntity;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ScreenEntity* Screen::addChild(ScreenEntity *newEntity) {
|
|
|
|
|
+ addEntity(newEntity);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
ScreenEntity* Screen::removeChild(ScreenEntity *entityToRemove) {
|
|
ScreenEntity* Screen::removeChild(ScreenEntity *entityToRemove) {
|
|
|
if(!entityToRemove)
|
|
if(!entityToRemove)
|
|
|
return NULL;
|
|
return NULL;
|