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

Side by Side Diff: chrome/browser/ui/views/dropdown_bar_view.cc

Issue 11269022: Add Vector2d classes that represent offsets, instead of using Point. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: RenderText fixup Created 8 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/views/dropdown_bar_view.h" 5 #include "chrome/browser/ui/views/dropdown_bar_view.h"
6 6
7 #include "chrome/browser/themes/theme_service.h" 7 #include "chrome/browser/themes/theme_service.h"
8 #include "chrome/browser/ui/view_ids.h" 8 #include "chrome/browser/ui/view_ids.h"
9 #include "chrome/browser/ui/views/frame/browser_view.h" 9 #include "chrome/browser/ui/views/frame/browser_view.h"
10 #include "grit/generated_resources.h" 10 #include "grit/generated_resources.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 // DropDownBarView, views::View overrides: 107 // DropDownBarView, views::View overrides:
108 void DropdownBarView::OnPaint(gfx::Canvas* canvas) { 108 void DropdownBarView::OnPaint(gfx::Canvas* canvas) {
109 OnPaintBackground(canvas); 109 OnPaintBackground(canvas);
110 OnPaintBorder(canvas); 110 OnPaintBorder(canvas);
111 111
112 if (animation_offset() > 0) { 112 if (animation_offset() > 0) {
113 gfx::Canvas animating_edges( 113 gfx::Canvas animating_edges(
114 gfx::Size(bounds().width(), kAnimatingEdgeHeight), 114 gfx::Size(bounds().width(), kAnimatingEdgeHeight),
115 canvas->scale_factor(), 115 canvas->scale_factor(),
116 false); 116 false);
117 canvas->Translate(bounds().origin()); 117 canvas->Translate(bounds().OffsetFromOrigin());
118 OnPaintBackground(&animating_edges); 118 OnPaintBackground(&animating_edges);
119 OnPaintBorder(&animating_edges); 119 OnPaintBorder(&animating_edges);
120 canvas->DrawImageInt(gfx::ImageSkia(animating_edges.ExtractImageRep()), 120 canvas->DrawImageInt(gfx::ImageSkia(animating_edges.ExtractImageRep()),
121 bounds().x(), animation_offset()); 121 bounds().x(), animation_offset());
122 } 122 }
123 } 123 }
124 124
125 //////////////////////////////////////////////////////////////////////////////// 125 ////////////////////////////////////////////////////////////////////////////////
126 // DropDownBarView, protected: 126 // DropDownBarView, protected:
127 127
128 void DropdownBarView::SetBackground(const gfx::ImageSkia* left_alpha_mask, 128 void DropdownBarView::SetBackground(const gfx::ImageSkia* left_alpha_mask,
129 const gfx::ImageSkia* right_alpha_mask) { 129 const gfx::ImageSkia* right_alpha_mask) {
130 set_background(new DropdownBackground(host()->browser_view(), left_alpha_mask, 130 set_background(new DropdownBackground(host()->browser_view(), left_alpha_mask,
131 right_alpha_mask)); 131 right_alpha_mask));
132 } 132 }
133 133
134 void DropdownBarView::SetBorder(int left_border_image_id, 134 void DropdownBarView::SetBorder(int left_border_image_id,
135 int middle_border_image_id, 135 int middle_border_image_id,
136 int right_border_image_id) { 136 int right_border_image_id) {
137 int border_image_ids[3] = {left_border_image_id, middle_border_image_id, 137 int border_image_ids[3] = {left_border_image_id, middle_border_image_id,
138 right_border_image_id}; 138 right_border_image_id};
139 set_border(views::Border::CreateBorderPainter( 139 set_border(views::Border::CreateBorderPainter(
140 new views::HorizontalPainter(border_image_ids))); 140 new views::HorizontalPainter(border_image_ids)));
141 } 141 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698