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

Unified Diff: chrome/browser/ui/fullscreen_exit_bubble.cc

Issue 7549005: Abstract fullscreen exit bubble logic to bring Linux's behaviour in line with (Closed) Base URL: /usr/local/google/chromium2/src@trunk
Patch Set: Rebase attempt #3. Created 9 years, 4 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
« no previous file with comments | « chrome/browser/ui/fullscreen_exit_bubble.h ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/fullscreen_exit_bubble.cc
diff --git a/chrome/browser/ui/fullscreen_exit_bubble.cc b/chrome/browser/ui/fullscreen_exit_bubble.cc
new file mode 100644
index 0000000000000000000000000000000000000000..8c42fa1d1d11fbd34e12039dde064626c378cb8f
--- /dev/null
+++ b/chrome/browser/ui/fullscreen_exit_bubble.cc
@@ -0,0 +1,88 @@
+// Copyright (c) 2011 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/ui/fullscreen_exit_bubble.h"
+
+#include "chrome/app/chrome_command_ids.h"
+#include "ui/gfx/rect.h"
+
+const double FullscreenExitBubble::kOpacity = 0.7;
+const int FullscreenExitBubble::kPaddingPx = 8;
+const int FullscreenExitBubble::kInitialDelayMs = 2300;
+const int FullscreenExitBubble::kIdleTimeMs = 2300;
+const int FullscreenExitBubble::kPositionCheckHz = 10;
+const int FullscreenExitBubble::kSlideInRegionHeightPx = 4;
+const int FullscreenExitBubble::kSlideInDurationMs = 350;
+const int FullscreenExitBubble::kSlideOutDurationMs = 700;
+
+FullscreenExitBubble::FullscreenExitBubble(
+ CommandUpdater::CommandUpdaterDelegate* delegate)
+ : delegate_(delegate) {
+}
+
+FullscreenExitBubble::~FullscreenExitBubble() {
+}
+
+void FullscreenExitBubble::StartWatchingMouse() {
+ // Start the initial delay timer and begin watching the mouse.
+ initial_delay_.Start(base::TimeDelta::FromMilliseconds(kInitialDelayMs), this,
+ &FullscreenExitBubble::CheckMousePosition);
+ gfx::Point cursor_pos = GetCursorScreenPoint();
+ last_mouse_pos_ = cursor_pos;
+ mouse_position_checker_.Start(
+ base::TimeDelta::FromMilliseconds(1000 / kPositionCheckHz), this,
+ &FullscreenExitBubble::CheckMousePosition);
+}
+
+void FullscreenExitBubble::CheckMousePosition() {
+ // Desired behavior:
+ //
+ // +------------+-----------------------------+------------+
+ // | _ _ _ _ | Exit full screen mode (F11) | _ _ _ _ | Slide-in region
+ // | _ _ _ _ \_____________________________/ _ _ _ _ | Neutral region
+ // | | Slide-out region
+ // : :
+ //
+ // * If app is not active, we hide the popup.
+ // * If the mouse is offscreen or in the slide-out region, we hide the popup.
+ // * If the mouse goes idle, we hide the popup.
+ // * If the mouse is in the slide-in-region and not idle, we show the popup.
+ // * If the mouse is in the neutral region and not idle, and the popup is
+ // currently sliding out, we show it again. This facilitates users
+ // correcting us if they try to mouse horizontally towards the popup and
+ // unintentionally drop too low.
+ // * Otherwise, we do nothing, because the mouse is in the neutral region and
+ // either the popup is hidden or the mouse is not idle, so we don't want to
+ // change anything's state.
+
+ gfx::Point cursor_pos = GetCursorScreenPoint();
+
+ // Check to see whether the mouse is idle.
+ if (cursor_pos != last_mouse_pos_) {
+ // The mouse moved; reset the idle timer.
+ idle_timeout_.Stop(); // If the timer isn't running, this is a no-op.
+ idle_timeout_.Start(base::TimeDelta::FromMilliseconds(kIdleTimeMs), this,
+ &FullscreenExitBubble::CheckMousePosition);
+ }
+ last_mouse_pos_ = cursor_pos;
+
+ if (!IsWindowActive() ||
+ !WindowContainsPoint(cursor_pos) ||
+ (cursor_pos.y() >= GetPopupRect(true).bottom()) ||
+ !idle_timeout_.IsRunning()) {
+ // The cursor is offscreen, in the slide-out region, or idle.
+ if (!initial_delay_.IsRunning()) {
+ Hide();
+ }
+ } else if ((cursor_pos.y() < kSlideInRegionHeightPx) ||
+ IsAnimating()) {
+ // The cursor is not idle, and either it's in the slide-in region or it's in
+ // the neutral region and we're sliding out.
+ Show();
+ }
+}
+
+void FullscreenExitBubble::ToggleFullscreen() {
+ delegate_->ExecuteCommand(IDC_FULLSCREEN);
+}
« no previous file with comments | « chrome/browser/ui/fullscreen_exit_bubble.h ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698