OLD | NEW |
---|---|
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 "ash/wm/image_cursors.h" | 5 #include "ash/wm/image_cursors.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "ui/base/cursor/cursor_loader.h" | 8 #include "ui/base/cursor/cursor_loader.h" |
9 #include "ui/base/cursor/cursor.h" | 9 #include "ui/base/cursor/cursor.h" |
10 #include "ui/gfx/point.h" | 10 #include "ui/gfx/point.h" |
(...skipping 15 matching lines...) Expand all Loading... | |
26 HotPoint hot_1x; | 26 HotPoint hot_1x; |
27 HotPoint hot_2x; | 27 HotPoint hot_2x; |
28 }; | 28 }; |
29 | 29 |
30 // TODO(oshima): Remove this comment (http://crbug.com/141586). | 30 // TODO(oshima): Remove this comment (http://crbug.com/141586). |
31 // The cursor's hot points are defined in chromeos cursor images at: | 31 // The cursor's hot points are defined in chromeos cursor images at: |
32 // http://folder/kuscher/projects/Chrome_OS/Pointers/focuspoint | 32 // http://folder/kuscher/projects/Chrome_OS/Pointers/focuspoint |
33 const CursorData kImageCursors[] = { | 33 const CursorData kImageCursors[] = { |
34 {ui::kCursorNull, IDR_AURA_CURSOR_PTR, {4, 4}, {8, 9}}, | 34 {ui::kCursorNull, IDR_AURA_CURSOR_PTR, {4, 4}, {8, 9}}, |
35 {ui::kCursorPointer, IDR_AURA_CURSOR_PTR, {4, 4}, {8, 9}}, | 35 {ui::kCursorPointer, IDR_AURA_CURSOR_PTR, {4, 4}, {8, 9}}, |
36 {ui::kCursorNoDrop, IDR_AURA_CURSOR_NO_DROP, {4, 4}, {8, 9}}, | 36 {ui::kCursorNoDrop, IDR_AURA_CURSOR_NO_DROP, {9, 9}, {18, 18}}, |
37 {ui::kCursorNotAllowed, IDR_AURA_CURSOR_NO_DROP, {4, 4}, {8, 9}}, | 37 {ui::kCursorNotAllowed, IDR_AURA_CURSOR_NO_DROP, {9, 9}, {18, 18}}, |
oshima
2013/03/11 16:34:43
does this change means the image has already been
mtomasz
2013/03/12 01:19:18
kCursorNoDrop and kCursorNotAllowed is the same as
| |
38 {ui::kCursorCopy, IDR_AURA_CURSOR_COPY, {4, 4}, {8, 9}}, | 38 {ui::kCursorCopy, IDR_AURA_CURSOR_COPY, {9, 9}, {18, 18}}, |
39 {ui::kCursorHand, IDR_AURA_CURSOR_HAND, {9, 4}, {19, 8}}, | 39 {ui::kCursorHand, IDR_AURA_CURSOR_HAND, {9, 4}, {19, 8}}, |
40 {ui::kCursorMove, IDR_AURA_CURSOR_MOVE, {11, 11}, {23, 23}}, | 40 {ui::kCursorMove, IDR_AURA_CURSOR_MOVE, {11, 11}, {23, 23}}, |
41 {ui::kCursorNorthEastResize, IDR_AURA_CURSOR_NORTH_EAST_RESIZE, | 41 {ui::kCursorNorthEastResize, IDR_AURA_CURSOR_NORTH_EAST_RESIZE, |
42 {12, 11}, {25, 23}}, | 42 {12, 11}, {25, 23}}, |
43 {ui::kCursorSouthWestResize, IDR_AURA_CURSOR_SOUTH_WEST_RESIZE, | 43 {ui::kCursorSouthWestResize, IDR_AURA_CURSOR_SOUTH_WEST_RESIZE, |
44 {12, 11}, {25, 23}}, | 44 {12, 11}, {25, 23}}, |
45 {ui::kCursorSouthEastResize, IDR_AURA_CURSOR_SOUTH_EAST_RESIZE, | 45 {ui::kCursorSouthEastResize, IDR_AURA_CURSOR_SOUTH_EAST_RESIZE, |
46 {11, 11}, {24, 23}}, | 46 {11, 11}, {24, 23}}, |
47 {ui::kCursorNorthWestResize, IDR_AURA_CURSOR_NORTH_WEST_RESIZE, | 47 {ui::kCursorNorthWestResize, IDR_AURA_CURSOR_NORTH_WEST_RESIZE, |
48 {11, 11}, {24, 23}}, | 48 {11, 11}, {24, 23}}, |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
123 kAnimatedCursorFrameDelayMs); | 123 kAnimatedCursorFrameDelayMs); |
124 } | 124 } |
125 return true; | 125 return true; |
126 } | 126 } |
127 | 127 |
128 void ImageCursors::SetPlatformCursor(gfx::NativeCursor* cursor) { | 128 void ImageCursors::SetPlatformCursor(gfx::NativeCursor* cursor) { |
129 cursor_loader_->SetPlatformCursor(cursor); | 129 cursor_loader_->SetPlatformCursor(cursor); |
130 } | 130 } |
131 | 131 |
132 } // namespace ash | 132 } // namespace ash |
OLD | NEW |