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

Side by Side Diff: views/controls/button/image_button.cc

Issue 1961001: Refactors animation to allow for cleaner subclassing. I'm doing this (Closed)
Patch Set: Incorporated review feedback Created 10 years, 7 months 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 unified diff | Download patch
« no previous file with comments | « views/controls/button/custom_button.cc ('k') | views/controls/button/text_button.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "views/controls/button/image_button.h" 5 #include "views/controls/button/image_button.h"
6 6
7 #include "app/throb_animation.h" 7 #include "app/throb_animation.h"
8 #include "gfx/canvas.h" 8 #include "gfx/canvas.h"
9 #include "gfx/skbitmap_operations.h" 9 #include "gfx/skbitmap_operations.h"
10 10
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 } 86 }
87 PaintFocusBorder(canvas); 87 PaintFocusBorder(canvas);
88 } 88 }
89 89
90 //////////////////////////////////////////////////////////////////////////////// 90 ////////////////////////////////////////////////////////////////////////////////
91 // ImageButton, protected: 91 // ImageButton, protected:
92 92
93 SkBitmap ImageButton::GetImageToPaint() { 93 SkBitmap ImageButton::GetImageToPaint() {
94 SkBitmap img; 94 SkBitmap img;
95 95
96 if (!images_[BS_HOT].isNull() && hover_animation_->IsAnimating()) { 96 if (!images_[BS_HOT].isNull() && hover_animation_->is_animating()) {
97 img = SkBitmapOperations::CreateBlendedBitmap(images_[BS_NORMAL], 97 img = SkBitmapOperations::CreateBlendedBitmap(images_[BS_NORMAL],
98 images_[BS_HOT], hover_animation_->GetCurrentValue()); 98 images_[BS_HOT], hover_animation_->GetCurrentValue());
99 } else { 99 } else {
100 img = images_[state_]; 100 img = images_[state_];
101 } 101 }
102 102
103 return !img.isNull() ? img : images_[BS_NORMAL]; 103 return !img.isNull() ? img : images_[BS_NORMAL];
104 } 104 }
105 105
106 //////////////////////////////////////////////////////////////////////////////// 106 ////////////////////////////////////////////////////////////////////////////////
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 bool ToggleImageButton::GetTooltipText(const gfx::Point& p, 160 bool ToggleImageButton::GetTooltipText(const gfx::Point& p,
161 std::wstring* tooltip) { 161 std::wstring* tooltip) {
162 if (!toggled_ || toggled_tooltip_text_.empty()) 162 if (!toggled_ || toggled_tooltip_text_.empty())
163 return Button::GetTooltipText(p, tooltip); 163 return Button::GetTooltipText(p, tooltip);
164 164
165 *tooltip = toggled_tooltip_text_; 165 *tooltip = toggled_tooltip_text_;
166 return true; 166 return true;
167 } 167 }
168 168
169 } // namespace views 169 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/button/custom_button.cc ('k') | views/controls/button/text_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698