summaryrefslogtreecommitdiffstats
path: root/ui/views/controls/button/text_button.cc
Commit message (Collapse)AuthorAgeFilesLines
* Fixed position of plus image on action box button; added ICON_CENTERED ↵yefim@chromium.org2012-09-141-3/+6
| | | | | | | | | | | | placement to TextButton BUG=147330 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=156599 Review URL: https://chromiumcodereview.appspot.com/10933049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156824 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 156599 - Fixed position of plus image on action box button; added ↵miket@chromium.org2012-09-131-6/+3
| | | | | | | | | | | | | ICON_CENTERED placement to TextButton BUG=147330 Review URL: https://chromiumcodereview.appspot.com/10933049 TBR=yefim@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156600 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed position of plus image on action box button; added ICON_CENTERED ↵yefim@chromium.org2012-09-131-3/+6
| | | | | | | | | | | placement to TextButton BUG=147330 Review URL: https://chromiumcodereview.appspot.com/10933049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156599 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 156200 - Conservative update button/label/textfield contentdbeam@chromium.org2012-09-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ RUN ] NativeTextfieldViewsTest.ModelChangesTestLowerCaseWithLocale controls\textfield\native_textfield_views_unittest.cc(434): error: Value of: model_->GetText() Actual: L"\x131" Expected: WideToUTF16(L"i") Which is: L"i" [ FAILED ] NativeTextfieldViewsTest.ModelChangesTestLowerCaseWithLocale (16 ms) If I had to guess it's that i is considered the same as ı somehow. Saves a repaint when no change actually occurs. BUG=chrome-os-partner:13141 TEST=build, run on lumpy, lucas Change-Id: I6ccb75141b7639571e24b2fbf7e3986d85e98cbc Review URL: https://chromiumcodereview.appspot.com/10916222 TBR=sheu@chromium.org Review URL: https://chromiumcodereview.appspot.com/10916254 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156206 0039d316-1c4b-4281-b951-d872f2087c98
* Conservative update button/label/textfield contentsheu@chromium.org2012-09-121-0/+2
| | | | | | | | | | | | | | Saves a repaint when no change actually occurs. BUG=chrome-os-partner:13141 TEST=build, run on lumpy, lucas Change-Id: I6ccb75141b7639571e24b2fbf7e3986d85e98cbc Review URL: https://chromiumcodereview.appspot.com/10916222 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156200 0039d316-1c4b-4281-b951-d872f2087c98
* Rid the world of the last of views::Event types: TouchEvent, GestureEvent, ↵ben@chromium.org2012-08-141-1/+0
| | | | | | | | | | MouseWheelEvent, ScrollEvent and DropTargetEvent, in favor of ui::Event derivatives. http://crbug.com/125937 TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10824295 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151602 0039d316-1c4b-4281-b951-d872f2087c98
* Rename DrawBitmapInt to DrawImageIntpkotwicz@chromium.org2012-06-071-15/+15
| | | | | | | | | | | Bug=None Test=Compiles Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=140877 Review URL: https://chromiumcodereview.appspot.com/10512021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141002 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 140877 - Rename DrawBitmapInt to DrawImageIntpkotwicz@chromium.org2012-06-061-15/+15
| | | | | | | | | | | | Bug=None Test=Compiles Review URL: https://chromiumcodereview.appspot.com/10512021 TBR=pkotwicz@chromium.org Review URL: https://chromiumcodereview.appspot.com/10546037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140882 0039d316-1c4b-4281-b951-d872f2087c98
* Rename DrawBitmapInt to DrawImageIntpkotwicz@chromium.org2012-06-061-15/+15
| | | | | | | | | Bug=None Test=Compiles Review URL: https://chromiumcodereview.appspot.com/10512021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140877 0039d316-1c4b-4281-b951-d872f2087c98
* Indicate focused state on text buttons with blue outline.flackr@chromium.org2012-06-061-1/+11
| | | | | | | | | | BUG=118040 TEST=Visit http://www.pagetutor.com/keeper/mystash/secretstuff.html and focus the native views text buttons. They should get a blue outline to indicate focus. Examine native web buttons which should be unaffected by this patch. Review URL: https://chromiumcodereview.appspot.com/10513009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140711 0039d316-1c4b-4281-b951-d872f2087c98
* ui: Rename the IDR constants to put hot/pressed state before position.tfarina@chromium.org2012-06-041-18/+18
| | | | | | | | | | Note: This was a TODO for @jamescook. R=sky@chromium.org,jamescook@chromium.org Review URL: https://chromiumcodereview.appspot.com/10456077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140385 0039d316-1c4b-4281-b951-d872f2087c98
* Take icon size into account when determine text height.antrim@chromium.org2012-05-251-2/+9
| | | | | | | | | | BUG=125897 TEST= Review URL: https://chromiumcodereview.appspot.com/10414040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138949 0039d316-1c4b-4281-b951-d872f2087c98
* Converts ui/views/controls, ui/views/examples, ui/base/models to use ↵pkotwicz@chromium.org2012-05-241-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gfx::ImageSkia Converts all instances using an SkBitmap to use a gfx::ImageSkia instead Replaces method names, variables and comments which include "bitmap" to use "image" instead Sed script used for conversion: 1 # Modify comments. 2 /\/\// { 3 # Save line in hold buffer. 4 h 5 # Extract portion of line which represents comment 6 # and put that into pattern space. 7 s|.*//\(.*\)|\1| 8 # Perform changes. 9 s| SkBitmap| ImageSkia|g 10 s| a bitmap| an image|g 11 s| Bitmap| Image|g 12 s| bitmap| image|g 13 # Append hold buffer to pattern space, 14 G 15 # Put everything back together. 16 s|\(.*\)\n\(.*\)//.*|\2//\1| 17 } 18 19 # Modify code. 20 # 21 # Store in hold buffer [code part ]//[comment part(including //)]. 22 # Thus you would get 4 consecutive slashes if the line actually does 23 # have a comment. 24 # Extract portion of line which has code and put that into pattern space. 25 26 # Line has a comment. 27 /\/\// { 28 s|\(.*\)//\(.*\)|\1////\2| 29 h 30 s|\(.*\)//.*|\1| 31 } 32 # No comment on line 33 /\/\// !{ 34 s|\(.*\)|\1//| 35 h 36 s|\(.*\)//|\1| 37 } 38 39 # Perform Changes 40 41 # Delete calls. 42 /buildMipMap(false)/d 43 # Replace includes. 44 s|third_party/skia/include/core/SkBitmap\.h|ui/gfx/image/image_skia\.h|g 45 s|ToSkBitmap|ToImageSkia|g 46 s|GetBitmapNamed|GetImageSkiaNamed|g 47 # Rename variables of type SkBitmap to variables of type gfx::ImageSkia 48 # Try to avoid renaming function names and classes which have 'SkBitmap' 49 # in them. 50 s|SkBitmap\([ (*&>),]\)|gfx::ImageSkia\1|g 51 # Modify variable names. 52 s|_bitmap|_image|g 53 s|bitmap|image_skia|g 54 s|bmp|image_skia|g 55 # Rename functions and classes which have 'SkBitmap' in them to use 'ImageSkia' instead 56 s|SkBitmap|ImageSkia|g 57 s|Bitmap|Image|g 58 # Restore things we didn't mean to change. 59 # SkImageOperations 60 s|ImageSkiaOperations|SkBitmapOperations|g 61 s|SkBitmapOperations::Create\(.*\)Image(|SkBitmapOperations::Create\1Bitmap(|g 62 s|skimage_skia_operations|skbitmap_operations|g 63 # SkPaint 64 s|setFilterImage|setFilterBitmap|g 65 s|isFilterImage|isFilterBitmap|g 66 # gfx::Canvas 67 s|ExtractImage|ExtractBitmap|g 68 # We will want to rename this function after everything else has changed. 69 s|DrawImageInt|DrawBitmapInt|g 70 71 # Append hold buffer to pattern space. 72 # Pattern space will look like: [code part]\n[code part]//[comment part (includi ng //). 73 G 74 # Put everything back together. 75 s|\(.*\)\n\(.*\)//\(.*\)|\1\3| I modified the following files manually afterwards: 1 ash/wm/workspace/frame_maximize_button.cc 2 ash/wm/workspace/frame_maximize_button.h 3 chrome/browser/chromeos/login/helper.cc 4 chrome/browser/chromeos/status/network_menu.cc 5 chrome/browser/cookies_tree_model.cc 6 chrome/browser/cookies_tree_model.h 7 chrome/browser/ui/gtk/gtk_tree.cc 8 chrome/browser/ui/gtk/menu_gtk.cc 9 chrome/browser/ui/search_engines/template_url_table_model.cc 10 chrome/browser/ui/search_engines/template_url_table_model.h 11 chrome/browser/ui/toolbar/back_forward_menu_model.cc 12 chrome/browser/ui/toolbar/back_forward_menu_model.h 13 chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc 14 chrome/browser/ui/toolbar/wrench_menu_model.cc 15 chrome/browser/ui/toolbar/wrench_menu_model.h 16 chrome/browser/ui/views/hung_renderer_view.cc 17 chrome/browser/ui/views/infobars/infobar_button_border.cc 18 chrome/browser/ui/views/infobars/infobar_view.cc 19 chrome/browser/ui/views/task_manager_view.cc 20 chrome/browser/ui/views/web_intent_picker_views.cc 21 chrome/browser/ui/views/wrench_menu.cc 22 chrome/browser/ui/webui/chromeos/login/network_dropdown.cc 23 ui/views/controls/button/image_button.cc 24 ui/views/controls/button/image_button_unittest.cc 25 ui/views/controls/image_view.cc 26 ui/views/controls/image_view.h 27 ui/views/controls/scrollbar/bitmap_scroll_bar.cc 28 ui/views/controls/scrollbar/bitmap_scroll_bar.h 29 ui/views/controls/scrollbar/scroll_bar.h 30 ui/views/controls/table/table_view_win.cc 31 ui/views/controls/tree/tree_view_views.h 32 ui/views/controls/tree/tree_view_win.cc 33 ui/views/examples/table_example.cc 34 ui/views/view_unittest.cc Whitespace changes and changes in includes in: 1 ui/base/models/menu_model.h 2 ui/base/models/table_model.h 3 ui/base/models/tree_model.h 4 ui/views/controls/glow_hover_controller.h 5 ui/views/controls/menu/menu.h 6 ui/views/controls/menu/menu_config_views.cc 7 ui/views/controls/menu/native_menu_win.cc 8 ui/views/controls/message_box_view.h 9 ui/views/controls/table/table_view_views.cc 10 ui/views/controls/throbber.h 11 ui/views/examples/table_example.h TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10437006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138800 0039d316-1c4b-4281-b951-d872f2087c98
* Pass event bitmask (shift, control, alt) to ui::Accelerator instead of booleans.tfarina@chromium.org2012-05-181-2/+2
| | | | | | | | | | BUG=128242 R=ben@chromium.org TBR=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/10399044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137792 0039d316-1c4b-4281-b951-d872f2087c98
* ui: Move NativeTheme files into ui/base/native_theme/ directory.tfarina@chromium.org2012-05-151-40/+40
| | | | | | | | | | | | BUG=103304,125844 R=ben@chromium.org TBR=tony@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=136996 Review URL: https://chromiumcodereview.appspot.com/10310136 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137056 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 136996 - ui: Move NativeTheme files into ui/base/native_theme/ directory.tfarina@chromium.org2012-05-141-40/+40
| | | | | | | | | | | | | BUG=103304,125844 R=ben@chromium.org TBR=tony@chromium.org Review URL: https://chromiumcodereview.appspot.com/10310136 TBR=tfarina@chromium.org Review URL: https://chromiumcodereview.appspot.com/10387121 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137003 0039d316-1c4b-4281-b951-d872f2087c98
* ui: Move NativeTheme files into ui/base/native_theme/ directory.tfarina@chromium.org2012-05-141-40/+40
| | | | | | | | | | BUG=103304,125844 R=ben@chromium.org TBR=tony@chromium.org Review URL: https://chromiumcodereview.appspot.com/10310136 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136996 0039d316-1c4b-4281-b951-d872f2087c98
* Correct handling of multiline text in buttons.antrim@chromium.org2012-05-071-7/+21
| | | | | | | | | | BUG=125897 TEST= Review URL: http://codereview.chromium.org/10382028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135726 0039d316-1c4b-4281-b951-d872f2087c98
* Disable sub-pixel rendering on text buttons used for drag as they have ↵reveman@chromium.org2012-03-261-0/+3
| | | | | | | | | | | | transparent background. BUG=120079 TEST=manual Review URL: http://codereview.chromium.org/9861004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129051 0039d316-1c4b-4281-b951-d872f2087c98
* Removing GTK code from ui/views.saintlou@chromium.org2012-03-211-2/+0
| | | | | | | | | BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/9804001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127852 0039d316-1c4b-4281-b951-d872f2087c98
* ui/gfx: Rename almost all entries from gfx::CanvasSkia to gfx::Canvas.tfarina@chromium.org2012-03-151-2/+2
| | | | | | | | | | BUG=116572 R=asvitkine@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9705063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126935 0039d316-1c4b-4281-b951-d872f2087c98
* ui/gfx: Get rid of CanvasSkia::GetSkCanvas() function.tfarina@chromium.org2012-03-131-6/+5
| | | | | | | | | | BUG=116572 R=asvitkine@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9663077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126495 0039d316-1c4b-4281-b951-d872f2087c98
* ui/gfx: Get rid of CanvasSkia::AsCanvasSkia() function.tfarina@chromium.org2012-03-111-6/+4
| | | | | | | | | | BUG=116572 R=asvitkine@chromium.org TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9662034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126074 0039d316-1c4b-4281-b951-d872f2087c98
* ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.tfarina@chromium.org2012-03-091-1/+1
| | | | | | | | | | | | The final goal is to merge these two classes into a single gfx::Canvas class. BUG=116572 R=ben@chromium.org,asvitkine@chromium.org TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/9562038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125735 0039d316-1c4b-4281-b951-d872f2087c98
* views: Do not use deprecated ResourceBundle::GetBitmapNamed() function.tfarina@chromium.org2012-03-061-18/+19
| | | | | | | | | | | | Instead use the recommended ResourceBundle::GetImageNamed() function and convert it to the native type appropriately. BUG=58030 R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/9597022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125201 0039d316-1c4b-4281-b951-d872f2087c98
* Factor more colors into NativeTheme.saintlou@chromium.org2012-01-111-31/+14
| | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/9101004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117245 0039d316-1c4b-4281-b951-d872f2087c98
* Revert 116894 - Factor more colors into NativeTheme.dbeam@chromium.org2012-01-091-14/+31
| | | | | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/9101004 TBR=saintlou@chromium.org Review URL: http://codereview.chromium.org/9151011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116906 0039d316-1c4b-4281-b951-d872f2087c98
* Factor more colors into NativeTheme.saintlou@chromium.org2012-01-091-31/+14
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/9101004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116894 0039d316-1c4b-4281-b951-d872f2087c98
* views: Rename IsAccessibilityFocusableInRootView() to just ↵tfarina@chromium.org2011-12-231-2/+2
| | | | | | | | | | | IsAccessibilityFocusable(). BUG=105879 R=ben@chromium.org Review URL: http://codereview.chromium.org/9021002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115672 0039d316-1c4b-4281-b951-d872f2087c98
* views: Convert IsFocusable() to just focusable() since it's just a simple ↵tfarina@chromium.org2011-12-161-2/+2
| | | | | | | | | | | accessor. BUG=105879 R=ben@chromium.org Review URL: http://codereview.chromium.org/8964001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114852 0039d316-1c4b-4281-b951-d872f2087c98
* views: Convert IsEnabled() to just enabled() since it's just a simple accessor.tfarina@chromium.org2011-12-121-1/+1
| | | | | | | | | BUG=105879 R=ben@chromium.org Review URL: http://codereview.chromium.org/8909002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114012 0039d316-1c4b-4281-b951-d872f2087c98
* views: Move button directory to ui/views/controls/.tfarina@chromium.org2011-11-281-0/+860
BUG=104039 R=maruel@chromium.org TBR=ben@chromium.org Review URL: http://codereview.chromium.org/8716001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111669 0039d316-1c4b-4281-b951-d872f2087c98