diff options
Diffstat (limited to 'views/view.cc')
-rw-r--r-- | views/view.cc | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/views/view.cc b/views/view.cc index 988e76b..012240a 100644 --- a/views/view.cc +++ b/views/view.cc @@ -132,21 +132,6 @@ void View::SetBounds(const gfx::Rect& bounds) { } } -void View::RegisterForMouseNearEvents(const gfx::Insets& insets) { - RootView* root = GetRootView(); - if (insets.empty()) { - near_insets_.reset(NULL); - if (root) - root->UnregisterViewForNearNotification(this); - } else { - near_insets_.reset( - new gfx::Insets(insets.top(), insets.left(), insets.bottom(), - insets.right())); - if (root) - root->RegisterViewForNearNotification(this); - } -} - gfx::Rect View::GetLocalBounds(bool include_border) const { if (include_border || !border_.get()) return gfx::Rect(0, 0, width(), height()); @@ -552,7 +537,7 @@ void View::AddChildView(int index, View* v) { UpdateTooltip(); RootView* root = GetRootView(); if (root) - RegisterChildrenForRootNotifications(root, v); + RegisterChildrenForVisibleBoundsNotification(root, v); if (layout_manager_.get()) layout_manager_->ViewAdded(this, v); @@ -624,7 +609,7 @@ void View::DoRemoveChildView(View* a_view, RootView* root = GetRootView(); if (root) - UnregisterChildrenForRootNotifications(root, a_view); + UnregisterChildrenForVisibleBoundsNotification(root, a_view); a_view->PropagateRemoveNotifications(this); a_view->SetParent(NULL); @@ -1455,26 +1440,24 @@ ThemeProvider* View::GetThemeProvider() const { } // static -void View::RegisterChildrenForRootNotifications(RootView* root, View* view) { +void View::RegisterChildrenForVisibleBoundsNotification( + RootView* root, View* view) { DCHECK(root && view); if (view->GetNotifyWhenVisibleBoundsInRootChanges()) root->RegisterViewForVisibleBoundsNotification(view); - if (view->near_insets_.get()) - root->RegisterViewForNearNotification(view); for (int i = 0; i < view->GetChildViewCount(); ++i) - RegisterChildrenForRootNotifications(root, view->GetChildViewAt(i)); + RegisterChildrenForVisibleBoundsNotification(root, view->GetChildViewAt(i)); } // static -void View::UnregisterChildrenForRootNotifications( +void View::UnregisterChildrenForVisibleBoundsNotification( RootView* root, View* view) { DCHECK(root && view); if (view->GetNotifyWhenVisibleBoundsInRootChanges()) root->UnregisterViewForVisibleBoundsNotification(view); - if (view->near_insets_.get()) - root->UnregisterViewForNearNotification(view); for (int i = 0; i < view->GetChildViewCount(); ++i) - UnregisterChildrenForRootNotifications(root, view->GetChildViewAt(i)); + UnregisterChildrenForVisibleBoundsNotification(root, + view->GetChildViewAt(i)); } void View::AddDescendantToNotify(View* view) { |