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

Unified Diff: ash/wm/workspace/multi_window_resize_controller.h

Issue 771543002: Improve the logic for hiding the multi-window resize handle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fix_multi_window
Patch Set: Created 6 years 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 | « no previous file | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/multi_window_resize_controller.h
diff --git a/ash/wm/workspace/multi_window_resize_controller.h b/ash/wm/workspace/multi_window_resize_controller.h
index 94ed53473bbea502c2781198f1938ea8c320aed8..d4b8f354c57965de64d979ec65f29facc5a8f325 100644
--- a/ash/wm/workspace/multi_window_resize_controller.h
+++ b/ash/wm/workspace/multi_window_resize_controller.h
@@ -87,6 +87,8 @@ class ASH_EXPORT MultiWindowResizeController :
class ResizeMouseWatcherHost;
class ResizeView;
+ void CreateMouseWatcher();
+
// Returns a ResizeWindows based on the specified arguments. Use is_valid()
// to test if the return value is a valid multi window resize location.
ResizeWindows DetermineWindows(aura::Window* window,
@@ -100,8 +102,8 @@ class ASH_EXPORT MultiWindowResizeController :
// Finds a window by edge (one of the constants HitTestCompat.
aura::Window* FindWindowByEdge(aura::Window* window_to_ignore,
int edge_want,
- int x,
- int y) const;
+ int x_in_parent,
+ int y_in_parent) const;
// Returns the first window touching |window|.
aura::Window* FindWindowTouching(aura::Window* window,
@@ -112,9 +114,6 @@ class ASH_EXPORT MultiWindowResizeController :
Direction direction,
std::vector<aura::Window*>* others) const;
- // Hides the window after a delay.
- void DelayedHide();
-
// Shows the resizer if the mouse is still at a valid location. This is called
// from the |show_timer_|.
void ShowIfValidMouseLocation();
@@ -145,17 +144,14 @@ class ASH_EXPORT MultiWindowResizeController :
// (or the resize widget itself).
bool IsOverWindows(const gfx::Point& location_in_screen) const;
- // Returns true if |location_in_screen| is over |window|.
- bool IsOverWindow(aura::Window* window,
- const gfx::Point& location_in_screen,
- int component) const;
+ // Returns true if |location_in_screen| is over |component| in |window|.
+ bool IsOverComponent(aura::Window* window,
+ const gfx::Point& location_in_screen,
+ int component) const;
// Windows and direction to resize.
ResizeWindows windows_;
- // Timer before hiding.
- base::OneShotTimer<MultiWindowResizeController> hide_timer_;
-
// Timer used before showing.
base::OneShotTimer<MultiWindowResizeController> show_timer_;
« no previous file with comments | « no previous file | ash/wm/workspace/multi_window_resize_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698