VR: Improving UI colors and elements positioning

chrome/browser/android/vr_shell/ui_scene_manager.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/vr_shell/ui_scene_manager.h"
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h"
 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"
@@ skipping 33 matching lines @@
 static constexpr float kContentWidth = 0.96 * kContentDistance;
 static constexpr float kContentHeight = 0.64 * kContentDistance;
 static constexpr float kContentVerticalOffset = -0.1 * kContentDistance;
 static constexpr float kBackplaneSize = 1000.0;
 static constexpr float kBackgroundDistanceMultiplier = 1.414;
 
 static constexpr float kUrlBarDistance = 2.4;
 static constexpr float kUrlBarWidth = 0.672 * kUrlBarDistance;
 static constexpr float kUrlBarHeight = 0.088 * kUrlBarDistance;
 static constexpr float kUrlBarVerticalOffset = -0.516 * kUrlBarDistance;
+static constexpr float kUrlBarRotationRad = -0.175;
 
 static constexpr float kLoadingIndicatorWidth = 0.24 * kUrlBarDistance;
 static constexpr float kLoadingIndicatorHeight = 0.008 * kUrlBarDistance;
-static constexpr float kLoadingIndicatorOffset =
-    -0.016 * kUrlBarDistance - kLoadingIndicatorHeight / 2;
+static constexpr float kLoadingIndicatorVerticalOffset =
+    (-kUrlBarVerticalOffset + kContentVerticalOffset - kContentHeight / 2 -
+     kUrlBarHeight / 2) /
+    2;
+static constexpr float kLoadingIndicatorDepthOffset =
+    (kUrlBarDistance - kContentDistance) / 2;
 
 static constexpr float kSceneSize = 25.0;
 static constexpr float kSceneHeight = 4.0;
 static constexpr int kFloorGridlineCount = 40;
 
 static constexpr float kFullscreenDistance = 3;
 static constexpr float kFullscreenHeight = 0.64 * kFullscreenDistance;
 static constexpr float kFullscreenWidth = 1.138 * kFullscreenDistance;
 static constexpr float kFullscreenVerticalOffset = -0.1 * kFullscreenDistance;
 
@@ skipping 185 matching lines @@
 }
 
 void UiSceneManager::CreateUrlBar() {
   // TODO(cjgrant): Incorporate final size and position.
   auto url_bar = base::MakeUnique<UrlBar>(
       512,
       base::Bind(&UiSceneManager::OnUnsupportedMode, base::Unretained(this)));
   url_bar->set_debug_id(kUrlBar);
   url_bar->set_id(AllocateId());
   url_bar->set_translation({0, kUrlBarVerticalOffset, -kUrlBarDistance});
+  url_bar->set_rotation({1.0, 0.0, 0.0, kUrlBarRotationRad});
   url_bar->set_size({kUrlBarWidth, kUrlBarHeight, 1});
   url_bar->SetBackButtonCallback(
       base::Bind(&UiSceneManager::OnBackButtonClicked, base::Unretained(this)));
   url_bar_ = url_bar.get();
   control_elements_.push_back(url_bar.get());
   scene_->AddUiElement(std::move(url_bar));
 
   auto indicator = base::MakeUnique<LoadingIndicator>(256);
   indicator->set_debug_id(kLoadingIndicator);
   indicator->set_id(AllocateId());
-  indicator->set_translation({0, 0, kLoadingIndicatorOffset});
+  indicator->set_translation(
+      {0, kLoadingIndicatorVerticalOffset, kLoadingIndicatorDepthOffset});
   indicator->set_size({kLoadingIndicatorWidth, kLoadingIndicatorHeight, 1});
   indicator->set_parent_id(url_bar_->id());
   indicator->set_y_anchoring(YAnchoring::YTOP);
   loading_indicator_ = indicator.get();
   control_elements_.push_back(indicator.get());
   scene_->AddUiElement(std::move(indicator));
 }
 
 void UiSceneManager::CreateCloseButton() {
   std::unique_ptr<Button> element = base::MakeUnique<Button>(
@@ skipping 179 matching lines @@
   if (fullscreen_)
     return ColorScheme::kModeFullscreen;
   return ColorScheme::kModeNormal;
 }
 
 const ColorScheme& UiSceneManager::color_scheme() const {
   return ColorScheme::GetColorScheme(mode());
 }
 
 }  // namespace vr_shell