Add name property to WidgetPlacement (#1765)

MozillaReality · Sep 12, 2019 · 8b29a0d · 8b29a0d
1 parent f750a5a
commit 8b29a0d
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 0 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/UIWidget.java
@@ -71,6 +71,7 @@ private void initialize() {
         mBorderWidth = SettingsStore.getInstance(getContext()).getTransparentBorderWidth();
         mWidgetManager = (WidgetManagerDelegate) getContext();
         mWidgetPlacement = new WidgetPlacement(getContext());
+        mWidgetPlacement.name = getClass().getSimpleName();
         mHandle = mWidgetManager.newWidgetHandle();
         mWorldWidth = WidgetPlacement.pixelDimension(getContext(), R.dimen.world_width);
         initializeWidgetPlacement(mWidgetPlacement);

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WidgetPlacement.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WidgetPlacement.java
@@ -51,6 +51,7 @@ public WidgetPlacement(Context aContext) {
     // Widget will be curved if enabled.
     public boolean cylinder = true;
     public int borderColor = 0;
+    public String name;
     /*
      * Flat surface placements are automatically mapped to curved coordinates.
      * If a radius is set it's used for the automatic mapping of the yaw & angle when the
@@ -92,6 +93,7 @@ public void copyFrom(WidgetPlacement w) {
         this.cylinder = w.cylinder;
         this.cylinderMapRadius = w.cylinderMapRadius;
         this.borderColor = w.borderColor;
+        this.name = w.name;
     }
 
     public int textureWidth() {

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -194,6 +194,7 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         aPlacement.visible = true;
         aPlacement.cylinder = true;
         aPlacement.textureScale = 1.0f;
+        aPlacement.name = "Window";
         // Check Windows.placeWindow method for remaining placement set-up
     }
 

diff --git a/app/src/main/cpp/VRLayer.cpp b/app/src/main/cpp/VRLayer.cpp
@@ -26,6 +26,7 @@ struct VRLayer::State {
   device::EyeRect textureRect[2];
   SurfaceChangedDelegate surfaceChangedDelegate;
   std::function<void()> pendingEvent;
+  std::string name;
   State():
       initialized(false),
       priority(0),
@@ -94,6 +95,11 @@ VRLayer::GetDrawInFront() const {
   return m.drawInFront;
 }
 
+std::string
+VRLayer::GetName() const {
+  return m.name;
+}
+
 bool
 VRLayer::ShouldDrawBefore(const VRLayer& aLayer) {
   if (m.layerType == VRLayer::LayerType::CUBEMAP || m.layerType == VRLayer::LayerType::EQUIRECTANGULAR) {
@@ -177,6 +183,11 @@ VRLayer::SetDrawInFront(bool aDrawInFront) {
   m.drawInFront = aDrawInFront;
 }
 
+void
+VRLayer::SetName(const std::string &aName) {
+  m.name = aName;
+}
+
 void VRLayer::NotifySurfaceChanged(SurfaceChange aChange, const std::function<void()>& aFirstCompositeCallback) {
   if (m.surfaceChangedDelegate) {
     m.surfaceChangedDelegate(*this, aChange, aFirstCompositeCallback);

diff --git a/app/src/main/cpp/VRLayer.h b/app/src/main/cpp/VRLayer.h
@@ -47,6 +47,7 @@ class VRLayer {
   const vrb::Color& GetTintColor() const;
   const device::EyeRect& GetTextureRect(device::Eye aEye) const;
   bool GetDrawInFront() const;
+  std::string GetName() const;
 
   bool ShouldDrawBefore(const VRLayer& aLayer);
   void SetInitialized(bool aInitialized);
@@ -60,6 +61,7 @@ class VRLayer {
   void SetTextureRect(device::Eye aEye, const device::EyeRect& aTextureRect);
   void SetSurfaceChangedDelegate(const SurfaceChangedDelegate& aDelegate);
   void SetDrawInFront(bool aDrawInFront);
+  void SetName(const std::string& aName);
   void NotifySurfaceChanged(SurfaceChange aChange, const std::function<void()>& aFirstCompositeCallback);
 protected:
   struct State;

diff --git a/app/src/main/cpp/Widget.cpp b/app/src/main/cpp/Widget.cpp
@@ -449,6 +449,9 @@ Widget::SetPlacement(const WidgetPlacementPtr& aPlacement) {
   if (m.cylinder) {
     m.UpdateCylinderMatrix();
   }
+  if (GetLayer()) {
+    GetLayer()->SetName(aPlacement->name);
+  }
 }
 
 WidgetResizerPtr

diff --git a/app/src/main/cpp/WidgetPlacement.cpp b/app/src/main/cpp/WidgetPlacement.cpp
@@ -34,6 +34,17 @@ WidgetPlacement::FromJava(JNIEnv* aEnv, jobject& aObject) {
   result->name = aEnv->GetBooleanField(aObject, f); \
 }
 
+#define GET_STRING_FIELD(name) { \
+  jfieldID f = aEnv->GetFieldID(clazz, #name, "Ljava/lang/String;"); \
+  jstring javaString = (jstring)aEnv->GetObjectField(aObject, f); \
+  if (javaString) { \
+    const char* nativeString = aEnv->GetStringUTFChars(javaString, 0); \
+    result->name = nativeString; \
+    aEnv->ReleaseStringUTFChars(javaString, nativeString); \
+  } \
+}
+
+
   GET_INT_FIELD(width);
   GET_INT_FIELD(height);
   GET_FLOAT_FIELD(anchor.x(), "anchorX");
@@ -60,6 +71,7 @@ WidgetPlacement::FromJava(JNIEnv* aEnv, jobject& aObject) {
   GET_BOOLEAN_FIELD(cylinder);
   GET_FLOAT_FIELD(cylinderMapRadius, "cylinderMapRadius");
   GET_INT_FIELD(borderColor);
+  GET_STRING_FIELD(name);
 
   return result;
 }

diff --git a/app/src/main/cpp/WidgetPlacement.h b/app/src/main/cpp/WidgetPlacement.h
@@ -36,6 +36,7 @@ struct WidgetPlacement {
   bool cylinder;
   float cylinderMapRadius;
   int borderColor;
+  std::string name;
 
   int32_t GetTextureWidth() const;
   int32_t GetTextureHeight() const;