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

Unified Diff: ui/aura/window_port_aura.cc

Issue 2446893005: Adds a porting layer so aura can be made to work with mus (Closed)
Patch Set: cleanup Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: ui/aura/window_port_aura.cc
diff --git a/ui/aura/window_port_aura.cc b/ui/aura/window_port_aura.cc
new file mode 100644
index 0000000000000000000000000000000000000000..580fef5ff905517dfa00ea394d0a8809620ea10e
--- /dev/null
+++ b/ui/aura/window_port_aura.cc
@@ -0,0 +1,95 @@
+// Copyright 2016 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 "ui/aura/window_port_aura.h"
+
+#include "ui/aura/client/cursor_client.h"
+#include "ui/aura/env.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_delegate.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
+
+namespace aura {
+namespace {
+
+class ScopedCursorHider {
+ public:
+ explicit ScopedCursorHider(Window* window)
+ : window_(window), hid_cursor_(false) {
+ if (!window_->IsRootWindow())
+ return;
+ const bool cursor_is_in_bounds = window_->GetBoundsInScreen().Contains(
+ Env::GetInstance()->last_mouse_location());
+ client::CursorClient* cursor_client = client::GetCursorClient(window_);
+ if (cursor_is_in_bounds && cursor_client &&
+ cursor_client->IsCursorVisible()) {
+ cursor_client->HideCursor();
+ hid_cursor_ = true;
+ }
+ }
+ ~ScopedCursorHider() {
+ if (!window_->IsRootWindow())
+ return;
+
+ // Update the device scale factor of the cursor client only when the last
+ // mouse location is on this root window.
+ if (hid_cursor_) {
+ client::CursorClient* cursor_client = client::GetCursorClient(window_);
+ if (cursor_client) {
+ const display::Display& display =
+ display::Screen::GetScreen()->GetDisplayNearestWindow(window_);
+ cursor_client->SetDisplay(display);
+ cursor_client->ShowCursor();
+ }
+ }
+ }
+
+ private:
+ Window* window_;
+ bool hid_cursor_;
+
+ DISALLOW_COPY_AND_ASSIGN(ScopedCursorHider);
+};
+
+} // namespace
+
+WindowPortAura::WindowPortAura(Window* window) : window_(window) {}
+
+WindowPortAura::~WindowPortAura() {}
+
+std::unique_ptr<WindowPortInitData> WindowPortAura::Init(Window* window) {
+ return nullptr;
+}
+
+void WindowPortAura::OnInitDone(std::unique_ptr<WindowPortInitData> init_data) {
+}
+
+void WindowPortAura::OnDeviceScaleFactorChanged(float device_scale_factor) {
+ ScopedCursorHider hider(window_);
+ if (window_->delegate())
+ window_->delegate()->OnDeviceScaleFactorChanged(device_scale_factor);
+}
+
+void WindowPortAura::OnWillAddChild(Window* child) {}
+
+void WindowPortAura::OnWillRemoveChild(Window* child) {}
+
+void WindowPortAura::OnWillMoveChild(size_t current_index, size_t dest_index) {}
+
+void WindowPortAura::OnVisibilityChanged(bool visible) {}
+
+void WindowPortAura::OnDidChangeBounds(const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) {}
+
+std::unique_ptr<WindowPortPropertyData> WindowPortAura::OnWillChangeProperty(
+ const void* key) {
+ return nullptr;
+}
+
+void WindowPortAura::OnPropertyChanged(
+ const void* key,
+ std::unique_ptr<WindowPortPropertyData> data) {}
+
+} // namespace aura

Powered by Google App Engine
This is Rietveld 408576698