[TIMOB-10542] Window modal option

src/tibb/NativeWindowObject.cpp

@@ -14,6 +14,7 @@
 #include <bb/cascades/Image>
 #include <bb/cascades/Page>
 #include <bb/cascades/TitleBar>
+#include <bb/cascades/Sheet>
 #include <bb/device/DisplayInfo>
 
 #include "EventHandler.h"
@@ -36,7 +37,7 @@ NativeObject* NativeWindowObject::createWindow(TiObject* tiObject, NativeObjectF
 }
 
 NativeWindowObject::NativeWindowObject(TiObject* tiObject)
-    : NativeControlObject(tiObject, N_TYPE_WINDOW)
+    : NativeControlObject(tiObject, N_TYPE_WINDOW), modalSheet_(NULL), title_(" ")
 {
 }
 
@@ -75,14 +76,27 @@ int NativeWindowObject::setOrientationModes(TiObject* obj) {
 }
 
 int NativeWindowObject::setTitle(TiObject* obj) {
-    QString title = QString::fromUtf8(*String::Utf8Value(obj->getValue()));
-    scene_.titleBar()->setTitle(title);
+	title_ = QString::fromUtf8(*String::Utf8Value(obj->getValue()));
+    scene_.titleBar()->setTitle(title_);
     return NATIVE_ERROR_OK;
 }
 
-void NativeWindowObject::open()
+void NativeWindowObject::open(bool modal)
 {
-    SceneManager::instance()->presentScene(&scene_);
+	if(SceneManager::instance()->activeScene() == NULL) {
+		// At least one scene needs to be in place, AKA: one window needs to be opened.
+		modal = false;
+	}
+	if(modal) {
+	    scene_.titleBar()->setTitle(title_);
+		modalSheet_ = bb::cascades::Sheet::create();
+		modalSheet_->setContent(scene_.pane());
+		modalSheet_->setPeekEnabled(false);
+		modalSheet_->open();
+		scene_.changeState(Scene::STATE_ONSTAGE);
+	} else {
+	    SceneManager::instance()->presentScene(&scene_);
+	}
     events_["open"]->container()->fireEvent();
 }
 
@@ -92,7 +106,11 @@ void NativeWindowObject::close()
         // This window is not currently open.
         return;
     }
-    scene_.close();
+    if(modalSheet_ == NULL) {
+    	scene_.close();
+    } else {
+    	modalSheet_->close();
+    }
     events_["close"]->container()->fireEvent();
 }
 

src/tibb/NativeWindowObject.h

@@ -13,6 +13,13 @@
 #include "NativeControlObject.h"
 #include "PageScene.h"
 
+namespace bb
+{
+namespace cascades
+{
+class Sheet;
+}
+}
 class NativeWindowObject : public NativeControlObject {
 public:
     static NativeObject* createWindow(TiObject* tiObject, NativeObjectFactory* factory);
@@ -26,7 +33,7 @@ class NativeWindowObject : public NativeControlObject {
     virtual int setOrientationModes(TiObject* obj);
     virtual int setTitle(TiObject* obj);
 
-    void open();
+    void open(bool);
     void close();
 
     void addAction(const QString& title, const QString& image, v8::Handle<v8::Function> triggerCallback);
@@ -39,6 +46,8 @@ class NativeWindowObject : public NativeControlObject {
     explicit NativeWindowObject(TiObject* tiObject);
 
     titanium::PageScene scene_;
+    bb::cascades::Sheet* modalSheet_;
+    QString title_;
 };
 
 #endif

src/tibb/TiUIWindow.cpp

@@ -46,7 +46,7 @@ void TiUIWindow::initializeTiObject(TiObject* parentContext)
     }
 }
 
-Handle<Value> TiUIWindow::_open(void* userContext, TiObject*, const Arguments&)
+Handle<Value> TiUIWindow::_open(void* userContext, TiObject*, const Arguments& args)
 {
     HandleScope scope;
     TiUIWindow* self = static_cast<TiUIWindow*>(userContext);
@@ -58,7 +58,14 @@ Handle<Value> TiUIWindow::_open(void* userContext, TiObject*, const Arguments&)
         (*it)->setupEvents();
     }
 
-    window->open();
+    if(args.Length() > 0 && args[0]->IsObject())
+    {
+    	Local<Object> modal = args[0]->ToObject();
+    	Local<Boolean> isTrue = modal->Get(String::New("modal"))->ToBoolean();
+    	window->open(isTrue->Value());
+    } else {
+    	window->open(false);
+    }
     window->release(); // XXX(josh): Do we really want to release now?
 
     return Undefined();