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

Side by Side Diff: ui/native_theme/native_theme.h

Issue 12041085: Fix menu corners: the menu background was being painted as a rect when in fact, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | ui/native_theme/native_theme_aura.h » ('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) 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 #ifndef UI_NATIVE_THEME_NATIVE_THEME_H_ 5 #ifndef UI_NATIVE_THEME_NATIVE_THEME_H_
6 #define UI_NATIVE_THEME_NATIVE_THEME_H_ 6 #define UI_NATIVE_THEME_NATIVE_THEME_H_
7 7
8 #include "third_party/skia/include/core/SkColor.h" 8 #include "third_party/skia/include/core/SkColor.h"
9 #include "ui/gfx/native_widget_types.h" 9 #include "ui/gfx/native_widget_types.h"
10 #include "ui/native_theme/native_theme_export.h" 10 #include "ui/native_theme/native_theme_export.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 int arrow_x; 128 int arrow_x;
129 int arrow_y; 129 int arrow_y;
130 SkColor background_color; 130 SkColor background_color;
131 int classic_state; // Used on Windows when uxtheme is not available. 131 int classic_state; // Used on Windows when uxtheme is not available.
132 }; 132 };
133 133
134 struct MenuSeparatorExtraParams { 134 struct MenuSeparatorExtraParams {
135 bool has_gutter; 135 bool has_gutter;
136 }; 136 };
137 137
138 struct MenuBackgroundExtraParams {
139 int corner_radius;
140 };
141
138 struct ProgressBarExtraParams { 142 struct ProgressBarExtraParams {
139 double animated_seconds; 143 double animated_seconds;
140 bool determinate; 144 bool determinate;
141 int value_rect_x; 145 int value_rect_x;
142 int value_rect_y; 146 int value_rect_y;
143 int value_rect_width; 147 int value_rect_width;
144 int value_rect_height; 148 int value_rect_height;
145 }; 149 };
146 150
147 struct ScrollbarArrowExtraParams { 151 struct ScrollbarArrowExtraParams {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 }; 187 };
184 188
185 union ExtraParams { 189 union ExtraParams {
186 ButtonExtraParams button; 190 ButtonExtraParams button;
187 InnerSpinButtonExtraParams inner_spin; 191 InnerSpinButtonExtraParams inner_spin;
188 MenuArrowExtraParams menu_arrow; 192 MenuArrowExtraParams menu_arrow;
189 MenuCheckExtraParams menu_check; 193 MenuCheckExtraParams menu_check;
190 MenuItemExtraParams menu_item; 194 MenuItemExtraParams menu_item;
191 MenuListExtraParams menu_list; 195 MenuListExtraParams menu_list;
192 MenuSeparatorExtraParams menu_separator; 196 MenuSeparatorExtraParams menu_separator;
197 MenuBackgroundExtraParams menu_background;
193 ProgressBarExtraParams progress_bar; 198 ProgressBarExtraParams progress_bar;
194 ScrollbarArrowExtraParams scrollbar_arrow; 199 ScrollbarArrowExtraParams scrollbar_arrow;
195 ScrollbarTrackExtraParams scrollbar_track; 200 ScrollbarTrackExtraParams scrollbar_track;
196 ScrollbarThumbExtraParams scrollbar_thumb; 201 ScrollbarThumbExtraParams scrollbar_thumb;
197 SliderExtraParams slider; 202 SliderExtraParams slider;
198 TextFieldExtraParams text_field; 203 TextFieldExtraParams text_field;
199 TrackbarExtraParams trackbar; 204 TrackbarExtraParams trackbar;
200 }; 205 };
201 206
202 // Return the size of the part. 207 // Return the size of the part.
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 unsigned int thumb_inactive_color_; 293 unsigned int thumb_inactive_color_;
289 unsigned int thumb_active_color_; 294 unsigned int thumb_active_color_;
290 unsigned int track_color_; 295 unsigned int track_color_;
291 296
292 DISALLOW_COPY_AND_ASSIGN(NativeTheme); 297 DISALLOW_COPY_AND_ASSIGN(NativeTheme);
293 }; 298 };
294 299
295 } // namespace ui 300 } // namespace ui
296 301
297 #endif // UI_NATIVE_THEME_NATIVE_THEME_H_ 302 #endif // UI_NATIVE_THEME_NATIVE_THEME_H_
OLDNEW
« no previous file with comments | « no previous file | ui/native_theme/native_theme_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698