Full-screen Magnifier: Support warping the cursor on the edge

ash/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 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 "ash/accelerators/accelerator_controller.h"
 
+#include <cmath>
+
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/focus_cycler.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_delegate.h"
 #include "ash/launcher/launcher_model.h"
+#include "ash/magnifier/magnification_controller.h"
 #include "ash/monitor/multi_monitor_manager.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/brightness/brightness_control_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/volume_control_delegate.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/snap_sizer.h"
 #include "base/command_line.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_manager.h"
 #include "ui/compositor/debug_utils.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/screen_rotation.h"
 #include "ui/oak/oak.h"
 
 namespace {
 
+// Factor of magnification scale. For example, when this value is 1.2, scale
+// value will be changed x1.0, x1.2, x1.44, ...
+const float kMagnificationFactor = 1.2;
+
 bool HandleCycleWindowMRU(ash::WindowCycleController::Direction direction,
                           bool is_alt_down) {
   ash::Shell::GetInstance()->
       window_cycle_controller()->HandleCycleWindow(direction, is_alt_down);
   // Always report we handled the key, even if the window didn't change.
   return true;
 }
 
 void HandleCycleWindowLinear(ash::CycleDirection direction) {
   ash::Shell::GetInstance()->launcher()->CycleWindowLinear(direction);
@@ skipping 112 matching lines @@
 }
 
 bool HandlePrintWindowHierarchy() {
   VLOG(1) << "Window hierarchy:";
   aura::Window* container = ash::Shell::GetInstance()->GetContainer(
       ash::internal::kShellWindowId_DefaultContainer);
   PrintWindowHierarchy(container, 0);
   return true;
 }
 
+// Mafnify the screen

[sky, 2012/06/11 16:19:14]

Magnify the screen.

[yoshiki, 2012/06/19 17:56:16]

Done.

+bool HandleMagnifyScreen(int delta_index) {
+  static int scale_index = 0;
+  scale_index = std::max(0, std::min(8, scale_index + delta_index));

[sky, 2012/06/11 16:19:14]

Why is this static here? Shouldn't the value live with the
mangificationcontroller?

[yoshiki, 2012/06/19 17:56:16]

Done.

+
+  ash::Shell::GetInstance()->magnification_controller()->
+    SetScale(std::pow(kMagnificationFactor, scale_index), true);

[sky, 2012/06/11 16:19:14]

indent 4

[yoshiki, 2012/06/19 17:56:16]

Done.

+
+  return true;
+}
+
 #endif
 
 }  // namespace
 
 namespace ash {
 
 ////////////////////////////////////////////////////////////////////////////////
 // AcceleratorController, public:
 
 AcceleratorController::AcceleratorController()
@@ skipping 279 matching lines @@
       return HandlePrintWindowHierarchy();
     case MONITOR_ADD_REMOVE:
       internal::MultiMonitorManager::AddRemoveMonitor();
       return true;
     case MONITOR_CYCLE:
       internal::MultiMonitorManager::CycleMonitor();
       return true;
     case MONITOR_TOGGLE_SCALE:
       internal::MultiMonitorManager::ToggleMonitorScale();
       return true;
+    case MAGNIFY_SCREEN_ZOOM_IN:
+      return HandleMagnifyScreen(1);
+    case MAGNIFY_SCREEN_ZOOM_OUT:
+      return HandleMagnifyScreen(-1);
 #endif
     default:
       NOTREACHED() << "Unhandled action " << it->second;
   }
   return false;
 }
 
 void AcceleratorController::SwitchToWindow(int window) {
   const LauncherItems& items =
       Shell::GetInstance()->launcher()->model()->items();
@@ skipping 20 matching lines @@
     // Then set this one as active.
     Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index);
   }
 }
 
 bool AcceleratorController::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace ash