[TIMOB-13877] ScrollView scrolling again

src/tibb/NativeScrollViewObject.cpp

@@ -23,19 +23,12 @@ NativeScrollViewContentObject::NativeScrollViewContentObject(TiObject* tiObject,
  	setContainer(bb::cascades::Container::create());
  	scrollView_ = scrollView;
 
- 	TiObject height;
-	height.setValue(String::New("UI.SIZE"));
- 	setHeight(&height);
-
-	TiObject width;
-	width.setValue(String::New("UI.SIZE"));
- 	setWidth(&height);
 }
 
 void NativeScrollViewContentObject::updateLayout(QRectF rect)
 {
     NativeControlObject::updateLayout(rect);
-    scrollView_->setContentWidthAndHeight(rect.width(), rect.height());
+    scrollView_->setContentWidthAndHeight(rect.width(), rect.height(), true);
 }
 
 NativeScrollViewObject::NativeScrollViewObject(TiObject* tiObject)
@@ -75,7 +68,7 @@ int NativeScrollViewObject::setLayout(TiObject *obj)
 		width.setValue(String::New("UI.FILL"));
 		err = contentViewProxy_->setWidth(&width);
 	}
-
+	else
 	if (str == "horizontal" && !contentWidthSet_)
 	{
 		TiObject height;
@@ -90,11 +83,11 @@ int NativeScrollViewObject::setLayout(TiObject *obj)
 
 	return err;
 }
-void NativeScrollViewObject::setContentWidthAndHeight(float width, float height)
+void NativeScrollViewObject::setContentWidthAndHeight(float width, float height, bool applyScrolling)
 {
     contentSize_.setHeight(height);
     contentSize_.setWidth(width);
-
+    if(!applyScrolling) return;
     if(contentSize_.width() > scrollViewSize_.width() && contentSize_.height() <= scrollViewSize_.height())
     {
     	scrollViewProperties_->setScrollMode(bb::cascades::ScrollMode::Horizontal);
@@ -136,8 +129,19 @@ int NativeScrollViewObject::initialize()
 
     bb::cascades::LayoutUpdateHandler::create(nativeContentView_).onLayoutFrameChanged(eventHandler_, SLOT(onContainerLayoutChange(QRectF)));
 
+
+ 	TiObject height;
+	height.setValue(String::New("UI.SIZE"));
+	contentViewProxy_->setHeight(&height);
+
+	TiObject width;
+	width.setValue(String::New("UI.SIZE"));
+	contentViewProxy_->setWidth(&width);
+
+
     contentSize_ = QSize(0,0);
     scrollViewSize_ = QSize(0,0);
+
     return NATIVE_ERROR_OK;
 }
 /*
@@ -192,6 +196,8 @@ void NativeScrollViewObject::updateLayout(QRectF rect)
     scrollView_->setPreferredWidth(w);
     scrollViewSize_.setHeight(h);
     scrollViewSize_.setWidth(w);
+
+    setContentWidthAndHeight(contentSize_.width(), contentSize_.height(), true);
 }
 
 int NativeScrollViewObject::setBackgroundColor(TiObject* obj)

src/tibb/NativeScrollViewObject.h

@@ -56,7 +56,7 @@ class NativeScrollViewObject : public NativeControlObject
     virtual int setLayout(TiObject *obj);
     virtual int setHeight(TiObject *obj);
     virtual int setWidth(TiObject *obj);
-    void setContentWidthAndHeight(float w, float h);
+    void setContentWidthAndHeight(float w, float h, bool a);
     bb::cascades::ScrollViewProperties* scrollViewProperties_;
     bb::cascades::ScrollView* scrollView_;
     bb::cascades::Container* contentView_;

src/tibb/TiNetwork.cpp

@@ -39,10 +39,10 @@ void TiNetwork::addObjectToParent(TiObject* parent, NativeObjectFactory* objectF
     obj->release();
 }
 
-static Handle<Value> _getNetworkType(void*)
+Handle<Value> TiNetwork::_getNetworkType(void*)
 {
-    QNetworkConfigurationManager *qncm = new QNetworkConfigurationManager();
-    QList<QNetworkConfiguration> activeConfigs = qncm->allConfigurations(QNetworkConfiguration::Active);
+    QNetworkConfigurationManager qncm;
+    QList<QNetworkConfiguration> activeConfigs = qncm.allConfigurations(QNetworkConfiguration::Active);
     foreach (QNetworkConfiguration qnc, activeConfigs){
     	int type = 0;
     	switch(qnc.bearerType())
@@ -55,18 +55,18 @@ static Handle<Value> _getNetworkType(void*)
     	    case QNetworkConfiguration::BearerWCDMA		: type = 5; break;
     	    case QNetworkConfiguration::BearerHSPA		: type = 6; break;
     	    case QNetworkConfiguration::BearerBluetooth	: type = 7; break;
-
+    	    default: type = 8; break;
     	}
     	return Number::New(type);
     }
     return Null();
 
 }
 
-static Handle<Value> _getNetworkTypeName(void*)
+Handle<Value> TiNetwork::_getNetworkTypeName(void*)
 {
-    QNetworkConfigurationManager *qncm = new QNetworkConfigurationManager();
-    QList<QNetworkConfiguration> activeConfigs = qncm->allConfigurations(QNetworkConfiguration::Active);
+    QNetworkConfigurationManager qncm;
+    QList<QNetworkConfiguration> activeConfigs = qncm.allConfigurations(QNetworkConfiguration::Active);
     foreach (QNetworkConfiguration qnc, activeConfigs){
     	QString typeName = qnc.bearerTypeName();
     	return String::New(typeName.toLocal8Bit().constData());
@@ -75,6 +75,13 @@ static Handle<Value> _getNetworkTypeName(void*)
 
 }
 
+Handle<Value> TiNetwork::_getOnline(void*)
+{
+    QNetworkConfigurationManager m;
+    return Boolean::New(m.isOnline());
+
+}
+
 void TiNetwork::onCreateStaticMembers()
 {
     TiProxy::onCreateStaticMembers();
@@ -86,6 +93,7 @@ void TiNetwork::onCreateStaticMembers()
 
     TiPropertySetGetObject::createProperty(this, "networkTypeName", this, NULL, _getNetworkTypeName);
     TiPropertySetGetObject::createProperty(this, "networkType", this, NULL, _getNetworkType);
+    TiPropertySetGetObject::createProperty(this, "online", this, NULL, _getOnline);
 }
 
 Handle<Value> TiNetwork::_encodeURIComponent(void* userContext, TiObject* /*caller*/, const Arguments& args)

src/tibb/TiNetwork.h

@@ -36,7 +36,9 @@ class TiNetwork : public TiProxy
     explicit TiNetwork(NativeObjectFactory* objectFactory);
     TiNetwork(const TiNetwork&);
     TiNetwork& operator=(const TiNetwork&);
-
+    static Handle<Value> _getNetworkTypeName(void*);
+    static Handle<Value> _getNetworkType(void*);
+    static Handle<Value> _getOnline(void*);
     NativeObjectFactory* objectFactory_;
 };