Merge pull request nwjs#2550 from jtg-gg/screen-rebase

rogerwang · rogerwang · commit 2eba96221b48 · 2014-11-04T12:13:33.000+10:00
Screen Geometry - rebase
diff --git a/nw.gypi b/nw.gypi
@@ -149,10 +149,10 @@
         'src/api/dispatcher_bindings_mac.mm',
         'src/api/dispatcher_host.cc',
         'src/api/dispatcher_host.h',
-#        'src/api/event/event.h',
-#        'src/api/event/event.cc',
-#        'src/api/screen/screen.h',
-#        'src/api/screen/screen.cc',
+        'src/api/event/event.h',
+        'src/api/event/event.cc',
+        'src/api/screen/screen.h',
+        'src/api/screen/screen.cc',
         'src/api/window_bindings.cc',
         'src/api/window_bindings.h',
         'src/api/menu/menu.cc',
diff --git a/src/api/dispatcher_host.cc b/src/api/dispatcher_host.cc
@@ -161,7 +161,7 @@ void DispatcherHost::OnAllocateObject(int object_id,
   } else if (type == "Shortcut") {
     objects_registry_.AddWithID(new Shortcut(object_id, weak_ptr_factory_.GetWeakPtr(), option), object_id);
   } else if (type == "Screen") {
-    //FIXME: objects_registry_.AddWithID(new EventListener(object_id, weak_ptr_factory_.GetWeakPtr(), option), object_id);
+    objects_registry_.AddWithID(new EventListener(object_id, weak_ptr_factory_.GetWeakPtr(), option), object_id);
   } else {
     LOG(ERROR) << "Allocate an object of unknown type: " << type;
     objects_registry_.AddWithID(new Base(object_id, weak_ptr_factory_.GetWeakPtr(), option), object_id);
@@ -253,7 +253,7 @@ void DispatcherHost::OnCallStaticMethodSync(
     nwapi::App::Call(shell, method, arguments, result);
     return;
   } else if (type == "Screen") {
-    //FIXME: nwapi::Screen::Call(this, method, arguments, result);
+    nwapi::Screen::Call(this, method, arguments, result);
     return;
   }
 
diff --git a/src/api/screen/screen.cc b/src/api/screen/screen.cc
@@ -46,6 +46,8 @@ std::string DisplayToJSON(const gfx::Display& display) {
   
   ret << ",\"scaleFactor\":" << display.device_scale_factor();
   ret << ",\"isBuiltIn\":" << (display.IsInternal() ? "true" : "false");
+  ret << ",\"rotation\":" << display.RotationAsDegree();
+  ret << ",\"touchSupport\":" << display.touch_support();
   ret << "}";
   
   return ret.str();
@@ -57,9 +59,10 @@ class JavaScriptDisplayObserver : BaseEvent, public gfx::DisplayObserver {
   gfx::Screen* screen_;
   
   // Called when the |display|'s bound has changed.
-  virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE {
+  virtual void OnDisplayMetricsChanged(const gfx::Display& display, uint32_t changed_metrics) OVERRIDE {
     base::ListValue arguments;
     arguments.AppendString(DisplayToJSON(display));
+    arguments.AppendInteger(changed_metrics);
     object_->dispatcher_host()->SendEvent(object_, "displayBoundsChanged", arguments);
   }
   
