Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: ash/display/event_transformation_handler.cc

Issue 11743013: Scaling scroll/fling events in multi-monitor setup (Closed) Base URL: https://chromium.googlesource.com/chromium/src@git-svn
Patch Set: Addressing Ben's comment Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/display/event_transformation_handler.h ('k') | ash/shell.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
(Empty)
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "ash/display/event_transformation_handler.h"
6
7 #include "ash/display/display_manager.h"
8 #include "ash/screen_ash.h"
9 #include "ash/shell.h"
10 #include "ash/wm/coordinate_conversion.h"
11 #include "ash/wm/window_util.h"
12 #include "ui/aura/root_window.h"
13 #include "ui/aura/window.h"
14 #include "ui/base/events/event.h"
15 #include "ui/compositor/dip_util.h"
16 #include "ui/gfx/display.h"
17 #include "ui/gfx/screen.h"
18
19 namespace ash {
20 namespace internal {
21 namespace {
22
23 // Boost factor for non-integrated displays.
24 const float kBoostForNonIntegrated = 1.20f;
25 }
26
27 EventTransformationHandler::EventTransformationHandler()
28 : transformation_mode_(TRANSFORM_AUTO) {
29 }
30
31 EventTransformationHandler::~EventTransformationHandler() {
32 }
33
34 void EventTransformationHandler::OnScrollEvent(ui::ScrollEvent* event) {
35 if (transformation_mode_ == TRANSFORM_NONE)
36 return;
37
38 // Get the device scale factor and stack it on the final scale factor.
39 gfx::Point point_in_screen(event->location());
40 aura::Window* target = static_cast<aura::Window*>(event->target());
41 const float scale_at_target = ui::GetDeviceScaleFactor(target->layer());
42 float scale = scale_at_target;
43
44 // Apply some additional scaling if the display is non-integrated.
45 wm::ConvertPointToScreen(target, &point_in_screen);
46 const gfx::Display& display =
47 Shell::GetScreen()->GetDisplayNearestPoint(point_in_screen);
48 DisplayManager* display_manager = Shell::GetInstance()->display_manager();
49 if (!display_manager->IsInternalDisplayId(display.id()))
50 scale *= kBoostForNonIntegrated;
51
52 event->Scale(scale);
53 }
54
55 } // namespace internal
56 } // namespace ash
57
OLDNEW
« no previous file with comments | « ash/display/event_transformation_handler.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698