summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/animation/bounds_animator.cc56
-rw-r--r--views/animation/bounds_animator.h24
-rw-r--r--views/animation/bounds_animator_unittest.cc178
-rw-r--r--views/controls/image_view.cc76
-rw-r--r--views/controls/image_view.h8
-rw-r--r--views/views.gyp2
-rw-r--r--views/window/custom_frame_view.cc20
-rw-r--r--views/window/window_shape.cc46
-rw-r--r--views/window/window_shape.h21
9 files changed, 102 insertions, 329 deletions
diff --git a/views/animation/bounds_animator.cc b/views/animation/bounds_animator.cc
index aee3675..e723504 100644
--- a/views/animation/bounds_animator.cc
+++ b/views/animation/bounds_animator.cc
@@ -28,7 +28,7 @@ BoundsAnimator::~BoundsAnimator() {
// Delete all the animations, but don't remove any child views. We assume the
// view owns us and is going to be deleted anyway.
for (ViewToDataMap::iterator i = data_.begin(); i != data_.end(); ++i)
- CleanupData(false, &(i->second), i->first);
+ CleanupData(&(i->second));
}
void BoundsAnimator::AnimateViewTo(View* view,
@@ -36,21 +36,21 @@ void BoundsAnimator::AnimateViewTo(View* view,
bool delete_when_done) {
DCHECK_EQ(view->GetParent(), parent_);
- Data existing_data;
-
- if (data_.count(view) > 0) {
- // Don't immediatly delete the animation, that might trigger a callback from
- // the animationcontainer.
- existing_data = data_[view];
-
- RemoveFromMaps(view);
+ scoped_ptr<Animation> current_animation;
+
+ if (data_.find(view) != data_.end()) {
+ // Currently animating this view, blow away the current animation and
+ // we'll create another animation below.
+ // We delay deleting the view until the end so that we don't prematurely
+ // send out notification that we're done.
+ current_animation.reset(ResetAnimationForView(view));
+ } else if (target == view->bounds()) {
+ // View is already at the target location, delete it if necessary.
+ if (delete_when_done)
+ delete view;
+ return;
}
- // NOTE: we don't check if the view is already at the target location. Doing
- // so leads to odd cases where no animations may be present after invoking
- // AnimateViewTo. AnimationProgressed does nothing when the bounds of the
- // view don't change.
-
Data& data = data_[view];
data.start_bounds = view->bounds();
data.target_bounds = target;
@@ -60,8 +60,6 @@ void BoundsAnimator::AnimateViewTo(View* view,
animation_to_view_[data.animation] = view;
data.animation->Show();
-
- CleanupData(true, &existing_data, NULL);
}
void BoundsAnimator::SetAnimationForView(View* view,
@@ -128,25 +126,22 @@ SlideAnimation* BoundsAnimator::CreateAnimation() {
return animation;
}
-void BoundsAnimator::RemoveFromMaps(View* view) {
+void BoundsAnimator::RemoveFromMapsAndDelete(View* view) {
DCHECK(data_.count(view) > 0);
- animation_to_view_.erase(data_[view].animation);
+ Data& data = data_[view];
+ animation_to_view_.erase(data.animation);
+ if (data.delete_when_done)
+ delete view;
data_.erase(view);
}
-void BoundsAnimator::CleanupData(bool send_cancel, Data* data, View* view) {
- if (send_cancel && data->delegate)
- data->delegate->AnimationCanceled(data->animation);
-
+void BoundsAnimator::CleanupData(Data* data) {
if (data->delete_delegate_when_done) {
delete static_cast<OwnedAnimationDelegate*>(data->delegate);
data->delegate = NULL;
}
- if (data->delete_when_done)
- delete view;
-
delete data->animation;
data->animation = NULL;
}
@@ -195,12 +190,12 @@ void BoundsAnimator::AnimationEnded(const Animation* animation) {
// Make a copy of the data as Remove empties out the maps.
Data data = data_[view];
- RemoveFromMaps(view);
+ RemoveFromMapsAndDelete(view);
if (delegate)
delegate->AnimationEnded(animation);
- CleanupData(false, &data, view);
+ CleanupData(&data);
}
void BoundsAnimator::AnimationCanceled(const Animation* animation) {
@@ -210,20 +205,17 @@ void BoundsAnimator::AnimationCanceled(const Animation* animation) {
// Make a copy of the data as Remove empties out the maps.
Data data = data_[view];
- RemoveFromMaps(view);
+ RemoveFromMapsAndDelete(view);
if (delegate)
delegate->AnimationCanceled(animation);
- CleanupData(false, &data, view);
+ CleanupData(&data);
}
void BoundsAnimator::AnimationContainerProgressed(
AnimationContainer* container) {
if (!repaint_bounds_.IsEmpty()) {
- // Adjust for rtl.
- repaint_bounds_.set_x(parent_->MirroredXWithWidthInsideView(
- repaint_bounds_.x(), repaint_bounds_.width()));
parent_->SchedulePaint(repaint_bounds_, false);
repaint_bounds_.SetRect(0, 0, 0, 0);
}
diff --git a/views/animation/bounds_animator.h b/views/animation/bounds_animator.h
index 606c05f..ab2fde9 100644
--- a/views/animation/bounds_animator.h
+++ b/views/animation/bounds_animator.h
@@ -50,9 +50,7 @@ class BoundsAnimator : public AnimationDelegate,
// Starts animating |view| from its current bounds to |target|. If
// |delete_when_done| is true the view is deleted when the animation
// completes. If there is already an animation running for the view it's
- // stopped and a new one started. If an AnimationDelegate has been set for
- // |view| it is removed (after being notified that the animation was
- // canceled).
+ // stopped and a new one started.
void AnimateViewTo(View* view,
const gfx::Rect& target,
bool delete_when_done);
@@ -66,7 +64,7 @@ class BoundsAnimator : public AnimationDelegate,
const SlideAnimation* GetAnimationForView(View* view);
// Stops animating the specified view. If the view was scheduled for deletion
- // it is deleted. This does nothing if |view| is not currently animating.
+ // it is deleted.
void StopAnimatingView(View* view);
// Sets the delegate for the animation created for the specified view. If
@@ -90,10 +88,6 @@ class BoundsAnimator : public AnimationDelegate,
observer_ = observer;
}
- protected:
- // Creates the animation to use for animating views.
- virtual SlideAnimation* CreateAnimation();
-
private:
// Tracks data about the view being animated.
struct Data {
@@ -126,13 +120,15 @@ class BoundsAnimator : public AnimationDelegate,
typedef std::map<const Animation*, View*> AnimationToViewMap;
- // Removes references to |view| and its animation. This does NOT delete the
- // animation or delegate.
- void RemoveFromMaps(View* view);
+ // Creates the animation to use for animating views.
+ SlideAnimation* CreateAnimation();
+
+ // Removes references to |view| and its animation as well as deleting |view|
+ // (if necessary). This does NOT delete the animation or delegate.
+ void RemoveFromMapsAndDelete(View* view);
- // Does the necessary cleanup for |data|. If |send_cancel| is true and a
- // delegate has been installed on |data| AnimationCanceled is invoked on it.
- void CleanupData(bool send_cancel, Data* data, View* view);
+ // Does the necessary cleanup for |data|.
+ void CleanupData(Data* data);
// Used when changing the animation for a view. This resets the maps for
// the animation used by view and returns the current animation. Ownership
diff --git a/views/animation/bounds_animator_unittest.cc b/views/animation/bounds_animator_unittest.cc
deleted file mode 100644
index 74ea5f2..0000000
--- a/views/animation/bounds_animator_unittest.cc
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright (c) 2010 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 "app/slide_animation.h"
-#include "app/test_animation_delegate.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "views/animation/bounds_animator.h"
-#include "views/view.h"
-
-using views::BoundsAnimator;
-
-namespace {
-
-class TestBoundsAnimator : public BoundsAnimator {
- public:
- explicit TestBoundsAnimator(views::View* view) : BoundsAnimator(view) {
- }
-
- protected:
- SlideAnimation* CreateAnimation() {
- SlideAnimation* animation = BoundsAnimator::CreateAnimation();
- animation->SetSlideDuration(10);
- return animation;
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestBoundsAnimator);
-};
-
-class OwnedDelegate : public BoundsAnimator::OwnedAnimationDelegate {
- public:
- OwnedDelegate() {
- deleted_ = false;
- canceled_ = false;
- }
-
- ~OwnedDelegate() {
- deleted_ = true;
- }
-
- static bool get_and_clear_deleted() {
- bool value = deleted_;
- deleted_ = false;
- return value;
- }
-
- static bool get_and_clear_canceled() {
- bool value = canceled_;
- canceled_ = false;
- return value;
- }
-
- // AnimationDelegate:
- virtual void AnimationCanceled(const Animation* animation) {
- canceled_ = true;
- }
-
- private:
- static bool deleted_;
- static bool canceled_;
-
- DISALLOW_COPY_AND_ASSIGN(OwnedDelegate);
-};
-
-// static
-bool OwnedDelegate::deleted_ = false;
-
-// static
-bool OwnedDelegate::canceled_ = false;
-
-class TestView : public views::View {
- public:
- TestView() {}
- virtual void SchedulePaint(const gfx::Rect& r, bool urgent) {
- if (dirty_rect_.IsEmpty())
- dirty_rect_ = r;
- else
- dirty_rect_ = dirty_rect_.Union(r);
- }
-
- const gfx::Rect& dirty_rect() const { return dirty_rect_; }
-
- private:
- gfx::Rect dirty_rect_;
-
- DISALLOW_COPY_AND_ASSIGN(TestView);
-};
-
-} // namespace
-
-class BoundsAnimatorTest : public testing::Test {
- public:
- BoundsAnimatorTest() : child_(new TestView()), animator_(&parent_) {
- parent_.AddChildView(child_);
- }
-
- TestView* parent() { return &parent_; }
- TestView* child() { return child_; }
- TestBoundsAnimator* animator() { return &animator_; }
-
- private:
- MessageLoopForUI message_loop_;
- TestView parent_;
- TestView* child_; // Owned by |parent_|.
- TestBoundsAnimator animator_;
-
- DISALLOW_COPY_AND_ASSIGN(BoundsAnimatorTest);
-};
-
-// Checks animate view to.
-TEST_F(BoundsAnimatorTest, AnimateViewTo) {
- TestAnimationDelegate delegate;
- gfx::Rect initial_bounds(0, 0, 10, 10);
- child()->SetBounds(initial_bounds);
- gfx::Rect target_bounds(10, 10, 20, 20);
- animator()->AnimateViewTo(child(), target_bounds, false);
- animator()->SetAnimationDelegate(child(), &delegate, false);
-
- // The animator should be animating now.
- EXPECT_TRUE(animator()->IsAnimating());
-
- // Run the message loop; the delegate exits the loop when the animation is
- // done.
- MessageLoop::current()->Run();
-
- // Make sure the bounds match of the view that was animated match.
- EXPECT_EQ(target_bounds, child()->bounds());
-
- // The parent should have been told to repaint as the animation progressed.
- // The resulting rect is the union of the original and target bounds.
- EXPECT_EQ(target_bounds.Union(initial_bounds), parent()->dirty_rect());
-}
-
-// Make sure an AnimationDelegate is deleted when canceled.
-TEST_F(BoundsAnimatorTest, DeleteDelegateOnCancel) {
- animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10), false);
- animator()->SetAnimationDelegate(child(), new OwnedDelegate(), true);
-
- animator()->Cancel();
-
- // The animator should no longer be animating.
- EXPECT_FALSE(animator()->IsAnimating());
-
- // The cancel should both cancel the delegate and delete it.
- EXPECT_TRUE(OwnedDelegate::get_and_clear_canceled());
- EXPECT_TRUE(OwnedDelegate::get_and_clear_deleted());
-}
-
-// Make sure an AnimationDelegate is deleted when another animation is
-// scheduled.
-TEST_F(BoundsAnimatorTest, DeleteDelegateOnNewAnimate) {
- animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10), false);
- animator()->SetAnimationDelegate(child(), new OwnedDelegate(), true);
-
- animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10), false);
-
- // Starting a new animation should both cancel the delegate and delete it.
- EXPECT_TRUE(OwnedDelegate::get_and_clear_deleted());
- EXPECT_TRUE(OwnedDelegate::get_and_clear_canceled());
-}
-
-// Makes sure StopAnimating works.
-TEST_F(BoundsAnimatorTest, StopAnimating) {
- scoped_ptr<OwnedDelegate> delegate(new OwnedDelegate());
-
- animator()->AnimateViewTo(child(), gfx::Rect(0, 0, 10, 10), false);
- animator()->SetAnimationDelegate(child(), new OwnedDelegate(), true);
-
- animator()->StopAnimatingView(child());
-
- // Shouldn't be animating now.
- EXPECT_FALSE(animator()->IsAnimating());
-
- // Stopping should both cancel the delegate and delete it.
- EXPECT_TRUE(OwnedDelegate::get_and_clear_deleted());
- EXPECT_TRUE(OwnedDelegate::get_and_clear_canceled());
-}
diff --git a/views/controls/image_view.cc b/views/controls/image_view.cc
index 9728332..d35585e 100644
--- a/views/controls/image_view.cc
+++ b/views/controls/image_view.cc
@@ -49,12 +49,6 @@ bool ImageView::GetImageSize(gfx::Size* image_size) {
return image_size_set_;
}
-gfx::Rect ImageView::GetImageBounds() const {
- gfx::Size image_size(image_size_set_ ?
- image_size_ : gfx::Size(image_.width(), image_.height()));
- return gfx::Rect(ComputeImageOrigin(image_size), image_size);
-}
-
void ImageView::ResetImageSize() {
image_size_set_ = false;
}
@@ -71,52 +65,74 @@ gfx::Size ImageView::GetPreferredSize() {
image_.height() + insets.height());
}
-gfx::Point ImageView::ComputeImageOrigin(const gfx::Size& image_size) const {
- gfx::Insets insets = GetInsets();
-
- int x;
+void ImageView::ComputeImageOrigin(int image_width, int image_height,
+ int *x, int *y) {
// In order to properly handle alignment of images in RTL locales, we need
// to flip the meaning of trailing and leading. For example, if the
// horizontal alignment is set to trailing, then we'll use left alignment for
// the image instead of right alignment if the UI layout is RTL.
Alignment actual_horiz_alignment = horiz_alignment_;
- if (UILayoutIsRightToLeft() && (horiz_alignment_ != CENTER))
- actual_horiz_alignment = (horiz_alignment_ == LEADING) ? TRAILING : LEADING;
+ if (UILayoutIsRightToLeft()) {
+ if (horiz_alignment_ == TRAILING)
+ actual_horiz_alignment = LEADING;
+ if (horiz_alignment_ == LEADING)
+ actual_horiz_alignment = TRAILING;
+ }
+
+ gfx::Insets insets = GetInsets();
+
switch (actual_horiz_alignment) {
- case LEADING: x = insets.left(); break;
- case TRAILING: x = width() - insets.right() - image_size.width(); break;
- case CENTER: x = (width() - image_size.width()) / 2; break;
- default: NOTREACHED(); x = 0; break;
+ case LEADING:
+ *x = insets.left();
+ break;
+ case TRAILING:
+ *x = width() - insets.right() - image_width;
+ break;
+ case CENTER:
+ *x = (width() - image_width) / 2;
+ break;
+ default:
+ NOTREACHED();
}
- int y;
switch (vert_alignment_) {
- case LEADING: y = insets.top(); break;
- case TRAILING: y = height() - insets.bottom() - image_size.height(); break;
- case CENTER: y = (height() - image_size.height()) / 2; break;
- default: NOTREACHED(); y = 0; break;
+ case LEADING:
+ *y = insets.top();
+ break;
+ case TRAILING:
+ *y = height() - insets.bottom() - image_height;
+ break;
+ case CENTER:
+ *y = (height() - image_height) / 2;
+ break;
+ default:
+ NOTREACHED();
}
-
- return gfx::Point(x, y);
}
void ImageView::Paint(gfx::Canvas* canvas) {
View::Paint(canvas);
+ int image_width = image_.width();
+ int image_height = image_.height();
- gfx::Rect image_bounds(GetImageBounds());
- if (image_bounds.IsEmpty())
+ if (image_width == 0 || image_height == 0)
return;
- if (image_bounds.size() != gfx::Size(image_.width(), image_.height())) {
+ int x, y;
+ if (image_size_set_ &&
+ (image_size_.width() != image_width ||
+ image_size_.width() != image_height)) {
// Resize case
image_.buildMipMap(false);
+ ComputeImageOrigin(image_size_.width(), image_size_.height(), &x, &y);
SkPaint paint;
paint.setFilterBitmap(true);
- canvas->DrawBitmapInt(image_, 0, 0, image_.width(), image_.height(),
- image_bounds.x(), image_bounds.y(), image_bounds.width(),
- image_bounds.height(), true, paint);
+ canvas->DrawBitmapInt(image_, 0, 0, image_width, image_height,
+ x, y, image_size_.width(), image_size_.height(),
+ true, paint);
} else {
- canvas->DrawBitmapInt(image_, image_bounds.x(), image_bounds.y());
+ ComputeImageOrigin(image_width, image_height, &x, &y);
+ canvas->DrawBitmapInt(image_, x, y);
}
}
diff --git a/views/controls/image_view.h b/views/controls/image_view.h
index 45eeecd..46cbb00 100644
--- a/views/controls/image_view.h
+++ b/views/controls/image_view.h
@@ -55,9 +55,6 @@ class ImageView : public View {
// size.
bool GetImageSize(gfx::Size* image_size);
- // Returns the actual bounds of the visible image inside the view.
- gfx::Rect GetImageBounds() const;
-
// Reset the image size to the current image dimensions.
void ResetImageSize();
@@ -73,16 +70,19 @@ class ImageView : public View {
void SetTooltipText(const std::wstring& tooltip);
std::wstring GetTooltipText();
+ // Return whether the image should be centered inside the view.
// Overriden from View
virtual gfx::Size GetPreferredSize();
virtual void Paint(gfx::Canvas* canvas);
virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
+
+ // Overriden from View.
virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
private:
// Compute the image origin given the desired size and the receiver alignment
// properties.
- gfx::Point ComputeImageOrigin(const gfx::Size& image_size) const;
+ void ComputeImageOrigin(int image_width, int image_height, int *x, int *y);
// Whether the image size is set.
bool image_size_set_;
diff --git a/views/views.gyp b/views/views.gyp
index 950fb86..d092722 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -301,8 +301,6 @@
'window/window_resources.h',
'window/window_gtk.cc',
'window/window_gtk.h',
- 'window/window_shape.cc',
- 'window/window_shape.h',
'window/window_win.cc',
'window/window_win.h',
],
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index e67a5c2..5f62219 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -17,7 +17,6 @@
#include "grit/app_resources.h"
#include "grit/app_strings.h"
#include "views/window/client_view.h"
-#include "views/window/window_shape.h"
#if defined(OS_LINUX)
#include "views/window/hit_test.h"
#endif
@@ -188,10 +187,27 @@ int CustomFrameView::NonClientHitTest(const gfx::Point& point) {
void CustomFrameView::GetWindowMask(const gfx::Size& size,
gfx::Path* window_mask) {
DCHECK(window_mask);
+
if (frame_->IsMaximized())
return;
- views::GetDefaultWindowMask(size, window_mask);
+ // Redefine the window visible region for the new size.
+ window_mask->moveTo(0, 3);
+ window_mask->lineTo(1, 2);
+ window_mask->lineTo(1, 1);
+ window_mask->lineTo(2, 1);
+ window_mask->lineTo(3, 0);
+
+ window_mask->lineTo(SkIntToScalar(size.width() - 3), 0);
+ window_mask->lineTo(SkIntToScalar(size.width() - 2), 1);
+ window_mask->lineTo(SkIntToScalar(size.width() - 1), 1);
+ window_mask->lineTo(SkIntToScalar(size.width() - 1), 2);
+ window_mask->lineTo(SkIntToScalar(size.width()), 3);
+
+ window_mask->lineTo(SkIntToScalar(size.width()),
+ SkIntToScalar(size.height()));
+ window_mask->lineTo(0, SkIntToScalar(size.height()));
+ window_mask->close();
}
void CustomFrameView::EnableClose(bool enable) {
diff --git a/views/window/window_shape.cc b/views/window/window_shape.cc
deleted file mode 100644
index dd234bf..0000000
--- a/views/window/window_shape.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2010 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 "views/window/window_shape.h"
-
-#include "gfx/path.h"
-#include "gfx/size.h"
-
-namespace views {
-
-void GetDefaultWindowMask(const gfx::Size &size, gfx::Path *window_mask) {
- // Redefine the window visible region for the new size.
- window_mask->moveTo(0, 3);
- window_mask->lineTo(1, 2);
- window_mask->lineTo(1, 1);
- window_mask->lineTo(2, 1);
- window_mask->lineTo(3, 0);
-
- window_mask->lineTo(SkIntToScalar(size.width() - 3), 0);
- window_mask->lineTo(SkIntToScalar(size.width() - 2), 1);
- window_mask->lineTo(SkIntToScalar(size.width() - 1), 1);
- window_mask->lineTo(SkIntToScalar(size.width() - 1), 2);
- window_mask->lineTo(SkIntToScalar(size.width()), 3);
-
- window_mask->lineTo(SkIntToScalar(size.width()),
- SkIntToScalar(size.height() - 3));
- window_mask->lineTo(SkIntToScalar(size.width() - 1),
- SkIntToScalar(size.height() - 3));
- window_mask->lineTo(SkIntToScalar(size.width() - 1),
- SkIntToScalar(size.height() - 1));
- window_mask->lineTo(SkIntToScalar(size.width() - 3),
- SkIntToScalar(size.height() - 2));
- window_mask->lineTo(SkIntToScalar(size.width() - 3),
- SkIntToScalar(size.height()));
-
- window_mask->lineTo(3, SkIntToScalar(size.height()));
- window_mask->lineTo(2, SkIntToScalar(size.height() - 2));
- window_mask->lineTo(1, SkIntToScalar(size.height() - 1));
- window_mask->lineTo(1, SkIntToScalar(size.height() - 3));
- window_mask->lineTo(0, SkIntToScalar(size.height() - 3));
-
- window_mask->close();
-}
-
-} // namespace views
diff --git a/views/window/window_shape.h b/views/window/window_shape.h
deleted file mode 100644
index 5b47415..0000000
--- a/views/window/window_shape.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2010 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.
-
-#ifndef VIEWS_WINDOW_WINDOW_SHAPE_H_
-#define VIEWS_WINDOW_WINDOW_SHAPE_H_
-
-namespace gfx {
-class Size;
-class Path;
-}
-
-namespace views {
-
-// Sets the window mask to a style that most likely matches
-// app/resources/window_*
-void GetDefaultWindowMask(const gfx::Size& size, gfx::Path* window_mask);
-
-} // namespace views
-
-#endif // #ifndef VIEWS_WINDOW_WINDOW_SHAPE_H_
generated by cgit v1.1 at 2025-03-13 02:05:37 +0000