diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 21:14:34 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-01 21:14:34 +0000 |
| commit | 644f4fba5a0fd2b13ef21e7f76e419ae3dc9db56 (patch) | |
| tree | 996e6debec24b811c5fb65e86ca1c718e7699ab3 /ui/resources | |
| parent | f0231a7c7bd34fb880d383f0d26eb85bd10b3dbd (diff) | |
| download | chromium_src-644f4fba5a0fd2b13ef21e7f76e419ae3dc9db56.zip chromium_src-644f4fba5a0fd2b13ef21e7f76e419ae3dc9db56.tar.gz chromium_src-644f4fba5a0fd2b13ef21e7f76e419ae3dc9db56.tar.bz2 | |
Implement the new Views button style.
Add IDRs for the assets landed in http://crrev.com/185350
Set images, alignment colors, shadows, and insets for new STYLE_BUTTON.
Add LabelButtonBorder support for [un]focused state painters.
Update ButtonExample; toggle focus, use normal colors, etc.
See screenshots of Patch Set 4 at: http://crbug.com/155363#c32
BUG=155363
TEST=views_examples_with_content_exe ButtonExample supports new button style (shift-click LabelButton); appearance and behavior meets expectations.
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/12385029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185594 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
| -rw-r--r-- | ui/resources/ui_resources.grd | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index e36695a..8dabb47 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -71,6 +71,60 @@ <structure type="chrome_scaled_image" name="IDR_BUBBLE_TL" file="bubble_top_left.png" /> <structure type="chrome_scaled_image" name="IDR_BUBBLE_TR" file="bubble_top_right.png" /> <structure type="chrome_scaled_image" name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_top.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_HOVER_BOTTOM" file="common/button_focused_hover_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_HOVER_BOTTOM_LEFT" file="common/button_focused_hover_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_HOVER_BOTTOM_RIGHT" file="common/button_focused_hover_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_HOVER_CENTER" file="common/button_focused_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_HOVER_LEFT" file="common/button_focused_hover_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_HOVER_RIGHT" file="common/button_focused_hover_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_HOVER_TOP" file="common/button_focused_hover_top.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_HOVER_TOP_LEFT" file="common/button_focused_hover_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_HOVER_TOP_RIGHT" file="common/button_focused_hover_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_NORMAL_BOTTOM" file="common/button_focused_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_NORMAL_BOTTOM_LEFT" file="common/button_focused_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_NORMAL_BOTTOM_RIGHT" file="common/button_focused_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_NORMAL_CENTER" file="common/button_focused_center.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_NORMAL_LEFT" file="common/button_focused_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_NORMAL_RIGHT" file="common/button_focused_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_NORMAL_TOP" file="common/button_focused_top.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_NORMAL_TOP_LEFT" file="common/button_focused_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_NORMAL_TOP_RIGHT" file="common/button_focused_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_PRESSED_BOTTOM" file="common/button_focused_pressed_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_PRESSED_BOTTOM_LEFT" file="common/button_focused_pressed_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_PRESSED_BOTTOM_RIGHT" file="common/button_focused_pressed_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_PRESSED_CENTER" file="common/button_focused_pressed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_PRESSED_LEFT" file="common/button_focused_pressed_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_PRESSED_RIGHT" file="common/button_focused_pressed_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_PRESSED_TOP" file="common/button_focused_pressed_top.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_PRESSED_TOP_LEFT" file="common/button_focused_pressed_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_FOCUSED_PRESSED_TOP_RIGHT" file="common/button_focused_pressed_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_HOVER_BOTTOM" file="common/button_hover_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_HOVER_BOTTOM_LEFT" file="common/button_hover_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_HOVER_BOTTOM_RIGHT" file="common/button_hover_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_HOVER_CENTER" file="common/button_hover_center.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_HOVER_LEFT" file="common/button_hover_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_HOVER_RIGHT" file="common/button_hover_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_HOVER_TOP" file="common/button_hover_top.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_HOVER_TOP_LEFT" file="common/button_hover_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_HOVER_TOP_RIGHT" file="common/button_hover_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_NORMAL_BOTTOM" file="common/button_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_NORMAL_BOTTOM_LEFT" file="common/button_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_NORMAL_BOTTOM_RIGHT" file="common/button_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_NORMAL_CENTER" file="common/button_center.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_NORMAL_LEFT" file="common/button_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_NORMAL_RIGHT" file="common/button_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_NORMAL_TOP" file="common/button_top.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_NORMAL_TOP_LEFT" file="common/button_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_NORMAL_TOP_RIGHT" file="common/button_top_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_PRESSED_BOTTOM" file="common/button_pressed_bottom.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_PRESSED_BOTTOM_LEFT" file="common/button_pressed_bottom_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_PRESSED_BOTTOM_RIGHT" file="common/button_pressed_bottom_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_PRESSED_CENTER" file="common/button_pressed_center.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_PRESSED_LEFT" file="common/button_pressed_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_PRESSED_RIGHT" file="common/button_pressed_right.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_PRESSED_TOP" file="common/button_pressed_top.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_PRESSED_TOP_LEFT" file="common/button_pressed_top_left.png" /> + <structure type="chrome_scaled_image" name="IDR_BUTTON_PRESSED_TOP_RIGHT" file="common/button_pressed_top_right.png" /> <if expr="is_posix and not is_macosx and not pp_ifdef('use_aura')"> <structure type="chrome_scaled_image" name="IDR_CHECKBOX_DISABLED_INDETERMINATE" file="linux/linux-checkbox-disabled-indeterminate.png" /> <structure type="chrome_scaled_image" name="IDR_CHECKBOX_DISABLED_OFF" file="linux/linux-checkbox-disabled-off.png" /> |