Fix pointer sorting issue (#3566)

MortimerGoro · web-flow · commit 96877ff6cace · 2020-06-26T14:54:18.000-07:00
diff --git a/app/src/main/cpp/BrowserWorld.cpp b/app/src/main/cpp/BrowserWorld.cpp
@@ -686,18 +686,13 @@ BrowserWorld::State::SortWidgets() {
       }
     }
     if (!target) {
-      bool isPointer = false;
       for (Controller& controller: controllers->GetControllers()) {
         if (controller.pointer && controller.pointer->GetRoot() == node) {
-          isPointer = true;
+          target = controller.pointer->GetHitWidget().get();
+          zDelta = 0.02f;
           break;
         }
       }
-      if (isPointer) {
-        // Always render the pointer on top
-        depthSorting.emplace(node.get(), std::make_pair(target, 0.0f));
-        continue;
-      }
     }
 
     if (!target && widgetResizer && widgetResizer->GetRoot() == node) {

Original file line number	Diff line number	Diff line change
`@@ -686,18 +686,13 @@ BrowserWorld::State::SortWidgets() {`
`686`	`686`	`}`
`687`	`687`	`}`
`688`	`688`	`if (!target) {`
`689`		`- bool isPointer = false;`
`690`	`689`	`for (Controller& controller: controllers->GetControllers()) {`
`691`	`690`	`if (controller.pointer && controller.pointer->GetRoot() == node) {`
`692`		`- isPointer = true;`
	`691`	`+ target = controller.pointer->GetHitWidget().get();`
	`692`	`+ zDelta = 0.02f;`
`693`	`693`	`break;`
`694`	`694`	`}`
`695`	`695`	`}`
`696`		`- if (isPointer) {`
`697`		`- // Always render the pointer on top`
`698`		`- depthSorting.emplace(node.get(), std::make_pair(target, 0.0f));`
`699`		`- continue;`
`700`		`- }`
`701`	`696`	`}`
`702`	`697`
`703`	`698`	`if (!target && widgetResizer && widgetResizer->GetRoot() == node) {`