diff options
| -rw-r--r-- | ui/gfx/compositor/layer_animator.h | 2 | ||||
| -rw-r--r-- | views/widget/widget.cc | 6 | ||||
| -rw-r--r-- | views/window/non_client_view.cc | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/ui/gfx/compositor/layer_animator.h b/ui/gfx/compositor/layer_animator.h index 4fca4e5..c7286b5 100644 --- a/ui/gfx/compositor/layer_animator.h +++ b/ui/gfx/compositor/layer_animator.h @@ -122,7 +122,7 @@ class COMPOSITOR_EXPORT LayerAnimator : public AnimationContainerElement { // these changes are reverted when the object is destroyed. NOTE: when the // settings object is created, it applies the default transition duration // (200ms). - class ScopedSettings { + class COMPOSITOR_EXPORT ScopedSettings { public: explicit ScopedSettings(LayerAnimator* animator); virtual ~ScopedSettings(); diff --git a/views/widget/widget.cc b/views/widget/widget.cc index 5b305c4..029b920 100644 --- a/views/widget/widget.cc +++ b/views/widget/widget.cc @@ -1110,10 +1110,10 @@ bool Widget::ShouldReleaseCaptureOnMouseReleased() const { } void Widget::SetInactiveRenderingDisabled(bool value) { - if (value == disable_inactive_rendering_) - return; - disable_inactive_rendering_ = value; + // We need to always notify the NonClientView so that it can trigger a paint. + // TODO: what's really needed is a way to know when either the active state + // changes or |disable_inactive_rendering_| changes. if (non_client_view_) non_client_view_->SetInactiveRenderingDisabled(value); native_widget_->SetInactiveRenderingDisabled(value); diff --git a/views/window/non_client_view.cc b/views/window/non_client_view.cc index b6fc923..92c7bc7 100644 --- a/views/window/non_client_view.cc +++ b/views/window/non_client_view.cc @@ -187,9 +187,8 @@ views::View* NonClientView::GetEventHandlerForPoint(const gfx::Point& point) { // NonClientFrameView, public: void NonClientFrameView::SetInactiveRenderingDisabled(bool disable) { - if (paint_as_active_ == disable) - return; - + // See comment in Widget::SetInactiveRenderingDisabled as to why we don't + // conditionally invoke ShouldPaintAsActiveChanged. paint_as_active_ = disable; ShouldPaintAsActiveChanged(); } |