summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ash/launcher/launcher.h3
-rw-r--r--ash/wm/frame_painter.cc41
-rw-r--r--ash/wm/frame_painter.h3
-rw-r--r--ash/wm/shelf_layout_manager.cc6
-rw-r--r--ash/wm/shelf_layout_manager.h8
-rw-r--r--ash/wm/shelf_layout_manager_unittest.cc8
-rw-r--r--chrome/browser/ui/views/frame/browser_frame_aura.cc2
-rw-r--r--chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc1
-rw-r--r--ui/aura/window.cc29
-rw-r--r--ui/aura/window.h16
-rw-r--r--ui/aura/window_unittest.cc19
11 files changed, 36 insertions, 100 deletions
diff --git a/ash/launcher/launcher.h b/ash/launcher/launcher.h
index dea112c..9404d2b 100644
--- a/ash/launcher/launcher.h
+++ b/ash/launcher/launcher.h
@@ -55,7 +55,8 @@ class ASH_EXPORT Launcher {
scoped_ptr<LauncherModel> model_;
- // Widget hosting the view.
+ // Widget hosting the view. May be hidden if we're not using a launcher,
+ // e.g. Aura compact window mode.
scoped_ptr<views::Widget> widget_;
aura::Window* window_container_;
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index f61baad..9492cfc 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -28,12 +28,8 @@ const int kTopThickness = 1;
// TODO(jamescook): Border is specified to be a single pixel overlapping
// the web content and may need to be built into the shadow layers instead.
const int kBorderThickness = 0;
-// Ash windows do not have a traditional visible window frame. Window content
-// extends to the edge of the window. We consider a small region outside the
-// window bounds and an even smaller region overlapping the window to be the
-// "non-client" area and use it for resizing.
-const int kResizeOutsideBoundsSize = 6;
-const int kResizeInsideBoundsSize = 1;
+// Number of pixels outside the window frame to look for resize events.
+const int kResizeAreaOutsideBounds = 6;
// In the window corners, the resize areas don't actually expand bigger, but the
// 16 px at the end of each edge triggers diagonal resizing.
const int kResizeAreaCornerSize = 16;
@@ -141,8 +137,8 @@ void FramePainter::Init(views::Widget* frame,
rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_RIGHT).ToSkBitmap();
// Ensure we get resize cursors for a few pixels outside our bounds.
- frame_->GetNativeWindow()->SetHitTestBoundsOverride(kResizeOutsideBoundsSize,
- kResizeInsideBoundsSize);
+ frame_->GetNativeWindow()->set_hit_test_bounds_inset(
+ -kResizeAreaOutsideBounds);
}
gfx::Rect FramePainter::GetBoundsForClientView(
@@ -167,26 +163,13 @@ gfx::Rect FramePainter::GetWindowBoundsForClientBounds(
int FramePainter::NonClientHitTest(views::NonClientFrameView* view,
const gfx::Point& point) {
gfx::Rect expanded_bounds = view->bounds();
- expanded_bounds.Inset(-kResizeOutsideBoundsSize, -kResizeOutsideBoundsSize);
+ expanded_bounds.Inset(-kResizeAreaOutsideBounds, -kResizeAreaOutsideBounds);
if (!expanded_bounds.Contains(point))
return HTNOWHERE;
// No avatar button.
- // Check the frame first, as we allow a small area overlapping the contents
- // to be used for resize handles.
- bool can_resize = frame_->widget_delegate() ?
- frame_->widget_delegate()->CanResize() :
- false;
- int frame_component = view->GetHTComponentForFrame(point,
- kResizeInsideBoundsSize,
- kResizeInsideBoundsSize,
- kResizeAreaCornerSize,
- kResizeAreaCornerSize,
- can_resize);
- if (frame_component != HTNOWHERE)
- return frame_component;
-
+ // Check the client view first, as it overlaps the window caption area.
int client_component = frame_->client_view()->NonClientHitTest(point);
if (client_component != HTNOWHERE)
return client_component;
@@ -199,6 +182,18 @@ int FramePainter::NonClientHitTest(views::NonClientFrameView* view,
maximize_button_->GetMirroredBounds().Contains(point))
return HTMAXBUTTON;
+ bool can_resize = frame_->widget_delegate() ?
+ frame_->widget_delegate()->CanResize() :
+ false;
+ int frame_component = view->GetHTComponentForFrame(point,
+ kTopThickness,
+ kBorderThickness,
+ kResizeAreaCornerSize,
+ kResizeAreaCornerSize,
+ can_resize);
+ if (frame_component != HTNOWHERE)
+ return frame_component;
+
// Caption is a safe default.
return HTCAPTION;
}
diff --git a/ash/wm/frame_painter.h b/ash/wm/frame_painter.h
index 5be8ca1..2cf474d 100644
--- a/ash/wm/frame_painter.h
+++ b/ash/wm/frame_painter.h
@@ -27,8 +27,7 @@ class Widget;
namespace ash {
// Helper class for painting window frames. Exists to share code between
-// various implementations of views::NonClientFrameView. Canonical source of
-// layout constants for Ash window frames.
+// various implementations of views::NonClientFrameView.
class ASH_EXPORT FramePainter {
public:
FramePainter();
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
index fff8c19..eca4c40c 100644
--- a/ash/wm/shelf_layout_manager.cc
+++ b/ash/wm/shelf_layout_manager.cc
@@ -26,9 +26,6 @@ ui::Layer* GetLayer(views::Widget* widget) {
} // namespace
-// static
-const int ShelfLayoutManager::kWorkspaceAreaBottomInset = 2;
-
////////////////////////////////////////////////////////////////////////////////
// ShelfLayoutManager, public:
@@ -147,8 +144,7 @@ void ShelfLayoutManager::CalculateTargetBounds(bool visible,
available_bounds.width(),
launcher_bounds.height());
if (visible)
- target_bounds->work_area_insets = gfx::Insets(
- 0, 0, max_height_ + kWorkspaceAreaBottomInset, 0);
+ target_bounds->work_area_insets = gfx::Insets(0, 0, max_height_, 0);
}
void ShelfLayoutManager::OnImplicitAnimationsCompleted() {
diff --git a/ash/wm/shelf_layout_manager.h b/ash/wm/shelf_layout_manager.h
index 5c4b6dd..8d69cc6 100644
--- a/ash/wm/shelf_layout_manager.h
+++ b/ash/wm/shelf_layout_manager.h
@@ -30,14 +30,6 @@ namespace internal {
class ASH_EXPORT ShelfLayoutManager : public aura::LayoutManager,
public ui::ImplicitAnimationObserver {
public:
- // We reserve a small area at the bottom of the workspace area to ensure that
- // the bottom-of-window resize handle can be hit.
- // TODO(jamescook): Some day we may want the workspace area to be an even
- // multiple of the size of the grid (currently 8 pixels), which will require
- // removing this and finding a way for hover and click events to pass through
- // the invisible parts of the launcher.
- static const int kWorkspaceAreaBottomInset;
-
ShelfLayoutManager(views::Widget* launcher, views::Widget* status);
virtual ~ShelfLayoutManager();
diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc
index 46f60a2..fbf924d 100644
--- a/ash/wm/shelf_layout_manager_unittest.cc
+++ b/ash/wm/shelf_layout_manager_unittest.cc
@@ -53,9 +53,8 @@ TEST_F(ShelfLayoutManagerTest, MAYBE_SetVisible) {
const ash::ScreenAsh* screen = Shell::GetInstance()->screen();
ASSERT_TRUE(screen);
- // Bottom inset should be the max of widget heights plus an adjustment.
- EXPECT_EQ(shelf->max_height() + ShelfLayoutManager::kWorkspaceAreaBottomInset,
- screen->work_area_insets().bottom());
+ // Bottom inset should be the max of widget heights.
+ EXPECT_EQ(shelf->max_height(), screen->work_area_insets().bottom());
// Hide the shelf.
shelf->SetVisible(false);
@@ -77,8 +76,7 @@ TEST_F(ShelfLayoutManagerTest, MAYBE_SetVisible) {
StepWidgetLayerAnimatorToEnd(shelf->launcher());
StepWidgetLayerAnimatorToEnd(shelf->status());
EXPECT_TRUE(shelf->visible());
- EXPECT_EQ(shelf->max_height() + ShelfLayoutManager::kWorkspaceAreaBottomInset,
- screen->work_area_insets().bottom());
+ EXPECT_EQ(shelf->max_height(), screen->work_area_insets().bottom());
// Make sure the bounds of the two widgets changed.
gfx::Rect launcher_bounds(shelf->launcher()->GetNativeView()->bounds());
diff --git a/chrome/browser/ui/views/frame/browser_frame_aura.cc b/chrome/browser/ui/views/frame/browser_frame_aura.cc
index 7e98186..b6a2062 100644
--- a/chrome/browser/ui/views/frame/browser_frame_aura.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_aura.cc
@@ -22,7 +22,7 @@ class BrowserFrameAura::WindowPropertyWatcher : public aura::WindowObserver {
virtual void OnWindowPropertyChanged(aura::Window* window,
const void* key,
- intptr_t old) OVERRIDE {
+ intptr_t old) {
if (key != aura::client::kShowStateKey)
return;
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc
index dd1c65f..9302846 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc
@@ -163,7 +163,6 @@ void NativeTabContentsViewAura::InitNativeTabContentsView() {
params.parent = NULL;
params.can_activate = true;
GetWidget()->Init(params);
- GetNativeWindow()->SetName("NativeTabContentsViewAura");
#if defined(USE_ASH)
ash::SetChildWindowVisibilityChangesAnimated(GetWidget()->GetNativeView());
#else
diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index 206a5c0..71fedda 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -55,8 +55,7 @@ Window::Window(WindowDelegate* delegate)
user_data_(NULL),
stops_event_propagation_(false),
ignore_events_(false),
- hit_test_bounds_override_outer_(0),
- hit_test_bounds_override_inner_(0) {
+ hit_test_bounds_inset_(0) {
}
Window::~Window() {
@@ -373,13 +372,6 @@ void Window::RemoveObserver(WindowObserver* observer) {
observers_.RemoveObserver(observer);
}
-void Window::SetHitTestBoundsOverride(int outer, int inner) {
- DCHECK(outer >= 0);
- DCHECK(inner >= 0);
- hit_test_bounds_override_outer_ = outer;
- hit_test_bounds_override_inner_ = inner;
-}
-
bool Window::ContainsPointInRoot(const gfx::Point& point_in_root) {
Window* root_window = GetRootWindow();
if (!root_window)
@@ -395,11 +387,8 @@ bool Window::ContainsPoint(const gfx::Point& local_point) {
}
bool Window::HitTest(const gfx::Point& local_point) {
- // Expand my bounds for hit testing (override is usually zero but it's
- // probably cheaper to do the math every time than to branch).
gfx::Rect local_bounds(gfx::Point(), bounds().size());
- local_bounds.Inset(-hit_test_bounds_override_outer_,
- -hit_test_bounds_override_outer_);
+ local_bounds.Inset(hit_test_bounds_inset_, hit_test_bounds_inset_);
// TODO(beng): hittest masks.
return local_bounds.Contains(local_point);
}
@@ -627,20 +616,6 @@ Window* Window::GetWindowForPoint(const gfx::Point& local_point,
(!for_event_handling && !ContainsPoint(local_point)))
return NULL;
- // Check if I should claim this event and not pass it to my children because
- // the location is inside my hit test override area. For details, see
- // SetHitTestBoundsOverride().
- if (for_event_handling && hit_test_bounds_override_inner_ != 0) {
- gfx::Rect inset_local_bounds(gfx::Point(), bounds().size());
- inset_local_bounds.Inset(hit_test_bounds_override_inner_,
- hit_test_bounds_override_inner_);
- // We know we're inside the normal local bounds, so if we're outside the
- // inset bounds we must be in the special hit test override area.
- DCHECK(HitTest(local_point));
- if (!inset_local_bounds.Contains(local_point))
- return delegate_ ? this : NULL;
- }
-
if (!return_tightest && delegate_)
return this;
diff --git a/ui/aura/window.h b/ui/aura/window.h
index 6f6ea8b..ebd3f13 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -229,12 +229,11 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
void set_ignore_events(bool ignore_events) { ignore_events_ = ignore_events; }
- // Sets the window to grab hits for an area extending |outer| pixels outside
- // its bounds and |inner| pixels inside its bounds (even if that inner region
- // overlaps a child window). This can be used to create an invisible non-
- // client area, for example if your windows have no visible frames but still
- // need to have resize edges. Both |outer| and |inner| must be >= 0.
- void SetHitTestBoundsOverride(int outer, int inner);
+ // When non-zero insets the window's bounds by |inset| when performing hit
+ // tests for event handling. Pass a negative value for |inset| to respond to
+ // events that occur slightly outside a window's bounds.
+ void set_hit_test_bounds_inset(int inset) { hit_test_bounds_inset_ = inset; }
+ int hit_test_bounds_inset() const { return hit_test_bounds_inset_; }
// Returns true if the |point_in_root| in root window's coordinate falls
// within this window's bounds. Returns false if the window is detached
@@ -441,9 +440,8 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
// Makes the window pass all events through to any windows behind it.
bool ignore_events_;
- // See SetHitTestBoundsOverride().
- int hit_test_bounds_override_outer_;
- int hit_test_bounds_override_inner_;
+ // Inset the window bounds by this amount when doing hit testing for events.
+ int hit_test_bounds_inset_;
ObserverList<WindowObserver> observers_;
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index e4c9def..ee3aeaf 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -282,7 +282,7 @@ TEST_F(WindowTest, HitTest) {
EXPECT_FALSE(w1.HitTest(gfx::Point(-1, -1)));
// We can expand the bounds slightly to track events outside our border.
- w1.SetHitTestBoundsOverride(1, 0);
+ w1.set_hit_test_bounds_inset(-1);
EXPECT_TRUE(w1.HitTest(gfx::Point(-1, -1)));
EXPECT_FALSE(w1.HitTest(gfx::Point(-2, -2)));
@@ -318,23 +318,6 @@ TEST_F(WindowTest, GetEventHandlerForPoint) {
EXPECT_EQ(w13.get(), root->GetEventHandlerForPoint(gfx::Point(26, 481)));
}
-TEST_F(WindowTest, GetEventHandlerForPointWithOverride) {
- // If our child is flush to our top-left corner he gets events just inside the
- // window edges.
- scoped_ptr<Window> parent(
- CreateTestWindow(SK_ColorWHITE, 1, gfx::Rect(10, 20, 400, 500), NULL));
- scoped_ptr<Window> child(
- CreateTestWindow(SK_ColorRED, 2, gfx::Rect(0, 0, 60, 70), parent.get()));
- EXPECT_EQ(child.get(), parent->GetEventHandlerForPoint(gfx::Point(0, 0)));
- EXPECT_EQ(child.get(), parent->GetEventHandlerForPoint(gfx::Point(1, 1)));
-
- // We can override the hit test bounds of the parent to make the parent grab
- // events along that edge.
- parent->SetHitTestBoundsOverride(0, 1);
- EXPECT_EQ(parent.get(), parent->GetEventHandlerForPoint(gfx::Point(0, 0)));
- EXPECT_EQ(child.get(), parent->GetEventHandlerForPoint(gfx::Point(1, 1)));
-}
-
TEST_F(WindowTest, GetTopWindowContainingPoint) {
Window* root = root_window();
root->SetBounds(gfx::Rect(0, 0, 300, 300));
generated by cgit v1.1 at 2025-02-12 00:05:36 +0000