diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 01:29:32 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 01:29:32 +0000 |
| commit | 64caaf0a74177909785a195df4d3d47d0a4643a8 (patch) | |
| tree | d526b5f2feaeefd53cbe54dbefd5feb88d17ce44 /ui/native_theme | |
| parent | 115a0e10a40f36265498446c0c8f7838a01bbbe6 (diff) | |
| download | chromium_src-64caaf0a74177909785a195df4d3d47d0a4643a8.zip chromium_src-64caaf0a74177909785a195df4d3d47d0a4643a8.tar.gz chromium_src-64caaf0a74177909785a195df4d3d47d0a4643a8.tar.bz2 | |
Nukes NativeScrollBarWin and fixes bugs with getting
NativeScrollBarViews to work for windows. Here's the set of things
fixed:
. Couple of rendering issues. Size of thumb was wrong because of using
wrong part. Wasn't painting gripper and state type was wrong.
. RTL issues: needed to invert coordinate when dragging and checking
for clicks in track was using wrong coordinates.
BUG=170195
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11953002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/native_theme')
| -rw-r--r-- | ui/native_theme/native_theme_base.cc | 3 | ||||
| -rw-r--r-- | ui/native_theme/native_theme_win.cc | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ui/native_theme/native_theme_base.cc b/ui/native_theme/native_theme_base.cc index 91a5172..7a833f6 100644 --- a/ui/native_theme/native_theme_base.cc +++ b/ui/native_theme/native_theme_base.cc @@ -210,7 +210,8 @@ void NativeThemeBase::Paint(SkCanvas* canvas, break; case kScrollbarHorizontalGripper: case kScrollbarVerticalGripper: - NOTIMPLEMENTED(); + // Invoked by views scrollbar code, don't care about for non-win + // implementations, so no NOTIMPLEMENTED. break; case kSliderTrack: PaintSliderTrack(canvas, state, rect, extra.slider); diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc index 0293405..3869334 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc @@ -1627,12 +1627,10 @@ int NativeThemeWin::GetWindowsPart(Part part, part_id = SBP_ARROWBTN; break; case kScrollbarHorizontalThumb: - part_id = extra.scrollbar_track.is_upper ? SBP_UPPERTRACKHORZ : - SBP_LOWERTRACKHORZ; + part_id = SBP_THUMBBTNHORZ; break; case kScrollbarVerticalThumb: - part_id = extra.scrollbar_track.is_upper ? SBP_UPPERTRACKVERT : - SBP_LOWERTRACKVERT; + part_id = SBP_THUMBBTNVERT; break; default: NOTREACHED() << "Invalid part: " << part; |