Index: ui/base/cursor/cursors_aura.cc |
diff --git a/ui/base/cursor/cursors_aura.cc b/ui/base/cursor/cursors_aura.cc |
index 1f29f2990617ca3e767c528043449f79ffc0d6ae..0d8a73d074ed239b84a4ef3a0f77193f8313a9b8 100644 |
--- a/ui/base/cursor/cursors_aura.cc |
+++ b/ui/base/cursor/cursors_aura.cc |
@@ -27,7 +27,7 @@ struct HotPoint { |
}; |
struct CursorData { |
- int id; |
+ CursorType id; |
int resource_id; |
HotPoint hot_1x; |
HotPoint hot_2x; |
@@ -42,102 +42,164 @@ struct CursorSet { |
}; |
const CursorData kNormalCursors[] = { |
- {ui::kCursorNull, IDR_AURA_CURSOR_PTR, {4, 4}, {7, 7}}, |
- {ui::kCursorPointer, IDR_AURA_CURSOR_PTR, {4, 4}, {7, 7}}, |
- {ui::kCursorNoDrop, IDR_AURA_CURSOR_NO_DROP, {9, 9}, {18, 18}}, |
- {ui::kCursorNotAllowed, IDR_AURA_CURSOR_NO_DROP, {9, 9}, {18, 18}}, |
- {ui::kCursorCopy, IDR_AURA_CURSOR_COPY, {9, 9}, {18, 18}}, |
- {ui::kCursorHand, IDR_AURA_CURSOR_HAND, {9, 4}, {19, 8}}, |
- {ui::kCursorMove, IDR_AURA_CURSOR_MOVE, {11, 11}, {23, 23}}, |
- {ui::kCursorNorthEastResize, IDR_AURA_CURSOR_NORTH_EAST_RESIZE, |
- {12, 11}, {25, 23}}, |
- {ui::kCursorSouthWestResize, IDR_AURA_CURSOR_SOUTH_WEST_RESIZE, |
- {12, 11}, {25, 23}}, |
- {ui::kCursorSouthEastResize, IDR_AURA_CURSOR_SOUTH_EAST_RESIZE, |
- {11, 11}, {24, 23}}, |
- {ui::kCursorNorthWestResize, IDR_AURA_CURSOR_NORTH_WEST_RESIZE, |
- {11, 11}, {24, 23}}, |
- {ui::kCursorNorthResize, IDR_AURA_CURSOR_NORTH_RESIZE, {11, 12}, {23, 23}}, |
- {ui::kCursorSouthResize, IDR_AURA_CURSOR_SOUTH_RESIZE, {11, 12}, {23, 23}}, |
- {ui::kCursorEastResize, IDR_AURA_CURSOR_EAST_RESIZE, {12, 11}, {25, 23}}, |
- {ui::kCursorWestResize, IDR_AURA_CURSOR_WEST_RESIZE, {12, 11}, {25, 23}}, |
- {ui::kCursorIBeam, IDR_AURA_CURSOR_IBEAM, {12, 12}, {24, 25}}, |
- {ui::kCursorAlias, IDR_AURA_CURSOR_ALIAS, {8, 6}, {15, 11}}, |
- {ui::kCursorCell, IDR_AURA_CURSOR_CELL, {11, 11}, {24, 23}}, |
- {ui::kCursorContextMenu, IDR_AURA_CURSOR_CONTEXT_MENU, {4, 4}, {8, 9}}, |
- {ui::kCursorCross, IDR_AURA_CURSOR_CROSSHAIR, {12, 12}, {25, 23}}, |
- {ui::kCursorHelp, IDR_AURA_CURSOR_HELP, {4, 4}, {8, 9}}, |
- {ui::kCursorVerticalText, IDR_AURA_CURSOR_XTERM_HORIZ, {12, 11}, {26, 23}}, |
- {ui::kCursorZoomIn, IDR_AURA_CURSOR_ZOOM_IN, {10, 10}, {20, 20}}, |
- {ui::kCursorZoomOut, IDR_AURA_CURSOR_ZOOM_OUT, {10, 10}, {20, 20}}, |
- {ui::kCursorRowResize, IDR_AURA_CURSOR_ROW_RESIZE, {11, 12}, {23, 23}}, |
- {ui::kCursorColumnResize, IDR_AURA_CURSOR_COL_RESIZE, {12, 11}, {25, 23}}, |
- {ui::kCursorEastWestResize, IDR_AURA_CURSOR_EAST_WEST_RESIZE, |
- {12, 11}, {25, 23}}, |
- {ui::kCursorNorthSouthResize, IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE, |
- {11, 12}, {23, 23}}, |
- {ui::kCursorNorthEastSouthWestResize, |
- IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE, {12, 11}, {25, 23}}, |
- {ui::kCursorNorthWestSouthEastResize, |
- IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE, {11, 11}, {24, 23}}, |
- {ui::kCursorGrab, IDR_AURA_CURSOR_GRAB, {8, 5}, {16, 10}}, |
- {ui::kCursorGrabbing, IDR_AURA_CURSOR_GRABBING, {9, 9}, {18, 18}}, |
+ {CursorType::kNull, IDR_AURA_CURSOR_PTR, {4, 4}, {7, 7}}, |
+ {CursorType::kPointer, IDR_AURA_CURSOR_PTR, {4, 4}, {7, 7}}, |
+ {CursorType::kNoDrop, IDR_AURA_CURSOR_NO_DROP, {9, 9}, {18, 18}}, |
+ {CursorType::kNotAllowed, IDR_AURA_CURSOR_NO_DROP, {9, 9}, {18, 18}}, |
+ {CursorType::kCopy, IDR_AURA_CURSOR_COPY, {9, 9}, {18, 18}}, |
+ {CursorType::kHand, IDR_AURA_CURSOR_HAND, {9, 4}, {19, 8}}, |
+ {CursorType::kMove, IDR_AURA_CURSOR_MOVE, {11, 11}, {23, 23}}, |
+ {CursorType::kNorthEastResize, |
+ IDR_AURA_CURSOR_NORTH_EAST_RESIZE, |
+ {12, 11}, |
+ {25, 23}}, |
+ {CursorType::kSouthWestResize, |
+ IDR_AURA_CURSOR_SOUTH_WEST_RESIZE, |
+ {12, 11}, |
+ {25, 23}}, |
+ {CursorType::kSouthEastResize, |
+ IDR_AURA_CURSOR_SOUTH_EAST_RESIZE, |
+ {11, 11}, |
+ {24, 23}}, |
+ {CursorType::kNorthWestResize, |
+ IDR_AURA_CURSOR_NORTH_WEST_RESIZE, |
+ {11, 11}, |
+ {24, 23}}, |
+ {CursorType::kNorthResize, |
+ IDR_AURA_CURSOR_NORTH_RESIZE, |
+ {11, 12}, |
+ {23, 23}}, |
+ {CursorType::kSouthResize, |
+ IDR_AURA_CURSOR_SOUTH_RESIZE, |
+ {11, 12}, |
+ {23, 23}}, |
+ {CursorType::kEastResize, IDR_AURA_CURSOR_EAST_RESIZE, {12, 11}, {25, 23}}, |
+ {CursorType::kWestResize, IDR_AURA_CURSOR_WEST_RESIZE, {12, 11}, {25, 23}}, |
+ {CursorType::kIBeam, IDR_AURA_CURSOR_IBEAM, {12, 12}, {24, 25}}, |
+ {CursorType::kAlias, IDR_AURA_CURSOR_ALIAS, {8, 6}, {15, 11}}, |
+ {CursorType::kCell, IDR_AURA_CURSOR_CELL, {11, 11}, {24, 23}}, |
+ {CursorType::kContextMenu, IDR_AURA_CURSOR_CONTEXT_MENU, {4, 4}, {8, 9}}, |
+ {CursorType::kCross, IDR_AURA_CURSOR_CROSSHAIR, {12, 12}, {25, 23}}, |
+ {CursorType::kHelp, IDR_AURA_CURSOR_HELP, {4, 4}, {8, 9}}, |
+ {CursorType::kVerticalText, |
+ IDR_AURA_CURSOR_XTERM_HORIZ, |
+ {12, 11}, |
+ {26, 23}}, |
+ {CursorType::kZoomIn, IDR_AURA_CURSOR_ZOOM_IN, {10, 10}, {20, 20}}, |
+ {CursorType::kZoomOut, IDR_AURA_CURSOR_ZOOM_OUT, {10, 10}, {20, 20}}, |
+ {CursorType::kRowResize, IDR_AURA_CURSOR_ROW_RESIZE, {11, 12}, {23, 23}}, |
+ {CursorType::kColumnResize, IDR_AURA_CURSOR_COL_RESIZE, {12, 11}, {25, 23}}, |
+ {CursorType::kEastWestResize, |
+ IDR_AURA_CURSOR_EAST_WEST_RESIZE, |
+ {12, 11}, |
+ {25, 23}}, |
+ {CursorType::kNorthSouthResize, |
+ IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE, |
+ {11, 12}, |
+ {23, 23}}, |
+ {CursorType::kNorthEastSouthWestResize, |
+ IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE, |
+ {12, 11}, |
+ {25, 23}}, |
+ {CursorType::kNorthWestSouthEastResize, |
+ IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE, |
+ {11, 11}, |
+ {24, 23}}, |
+ {CursorType::kGrab, IDR_AURA_CURSOR_GRAB, {8, 5}, {16, 10}}, |
+ {CursorType::kGrabbing, IDR_AURA_CURSOR_GRABBING, {9, 9}, {18, 18}}, |
}; |
const CursorData kLargeCursors[] = { |
- // The 2x hotspots should be double of the 1x, even though the cursors are |
- // shown as same size as 1x (64x64), because in 2x dpi screen, the 1x large |
- // cursor assets (64x64) are internally enlarged to the double size (128x128) |
- // by ResourceBundleImageSource. |
- {ui::kCursorNull, IDR_AURA_CURSOR_BIG_PTR, {10, 10}, {20, 20}}, |
- {ui::kCursorPointer, IDR_AURA_CURSOR_BIG_PTR, {10, 10}, {20, 20}}, |
- {ui::kCursorNoDrop, IDR_AURA_CURSOR_BIG_NO_DROP, {10, 10}, {20, 20}}, |
- {ui::kCursorNotAllowed, IDR_AURA_CURSOR_BIG_NO_DROP, {10, 10}, {20, 20}}, |
- {ui::kCursorCopy, IDR_AURA_CURSOR_BIG_COPY, {10, 10}, {20, 20}}, |
- {ui::kCursorHand, IDR_AURA_CURSOR_BIG_HAND, {25, 7}, {50, 14}}, |
- {ui::kCursorMove, IDR_AURA_CURSOR_BIG_MOVE, {32, 31}, {64, 62}}, |
- {ui::kCursorNorthEastResize, IDR_AURA_CURSOR_BIG_NORTH_EAST_RESIZE, |
- {31, 28}, {62, 56}}, |
- {ui::kCursorSouthWestResize, IDR_AURA_CURSOR_BIG_SOUTH_WEST_RESIZE, |
- {31, 28}, {62, 56}}, |
- {ui::kCursorSouthEastResize, IDR_AURA_CURSOR_BIG_SOUTH_EAST_RESIZE, |
- {28, 28}, {56, 56}}, |
- {ui::kCursorNorthWestResize, IDR_AURA_CURSOR_BIG_NORTH_WEST_RESIZE, |
- {28, 28}, {56, 56}}, |
- {ui::kCursorNorthResize, IDR_AURA_CURSOR_BIG_NORTH_RESIZE, |
- {29, 32}, {58, 64}}, |
- {ui::kCursorSouthResize, IDR_AURA_CURSOR_BIG_SOUTH_RESIZE, |
- {29, 32}, {58, 64}}, |
- {ui::kCursorEastResize, IDR_AURA_CURSOR_BIG_EAST_RESIZE, {35, 29}, {70, 58}}, |
- {ui::kCursorWestResize, IDR_AURA_CURSOR_BIG_WEST_RESIZE, {35, 29}, {70, 58}}, |
- {ui::kCursorIBeam, IDR_AURA_CURSOR_BIG_IBEAM, {30, 32}, {60, 64}}, |
- {ui::kCursorAlias, IDR_AURA_CURSOR_BIG_ALIAS, {19, 11}, {38, 22}}, |
- {ui::kCursorCell, IDR_AURA_CURSOR_BIG_CELL, {30, 30}, {60, 60}}, |
- {ui::kCursorContextMenu, IDR_AURA_CURSOR_BIG_CONTEXT_MENU, |
- {11, 11}, {22, 22}}, |
- {ui::kCursorCross, IDR_AURA_CURSOR_BIG_CROSSHAIR, {31, 30}, {62, 60}}, |
- {ui::kCursorHelp, IDR_AURA_CURSOR_BIG_HELP, {10, 11}, {20, 22}}, |
- {ui::kCursorVerticalText, IDR_AURA_CURSOR_BIG_XTERM_HORIZ, |
- {32, 30}, {64, 60}}, |
- {ui::kCursorZoomIn, IDR_AURA_CURSOR_BIG_ZOOM_IN, {25, 26}, {50, 52}}, |
- {ui::kCursorZoomOut, IDR_AURA_CURSOR_BIG_ZOOM_OUT, {26, 26}, {52, 52}}, |
- {ui::kCursorRowResize, IDR_AURA_CURSOR_BIG_ROW_RESIZE, {29, 32}, {58, 64}}, |
- {ui::kCursorColumnResize, IDR_AURA_CURSOR_BIG_COL_RESIZE, {35, 29}, {70, 58}}, |
- {ui::kCursorEastWestResize, IDR_AURA_CURSOR_BIG_EAST_WEST_RESIZE, |
- {35, 29}, {70, 58}}, |
- {ui::kCursorNorthSouthResize, IDR_AURA_CURSOR_BIG_NORTH_SOUTH_RESIZE, |
- {29, 32}, {58, 64}}, |
- {ui::kCursorNorthEastSouthWestResize, |
- IDR_AURA_CURSOR_BIG_NORTH_EAST_SOUTH_WEST_RESIZE, {32, 30}, {64, 60}}, |
- {ui::kCursorNorthWestSouthEastResize, |
- IDR_AURA_CURSOR_BIG_NORTH_WEST_SOUTH_EAST_RESIZE, {32, 31}, {64, 62}}, |
- {ui::kCursorGrab, IDR_AURA_CURSOR_BIG_GRAB, {21, 11}, {42, 22}}, |
- {ui::kCursorGrabbing, IDR_AURA_CURSOR_BIG_GRABBING, {20, 12}, {40, 24}}, |
+ // The 2x hotspots should be double of the 1x, even though the cursors are |
+ // shown as same size as 1x (64x64), because in 2x dpi screen, the 1x large |
+ // cursor assets (64x64) are internally enlarged to the double size |
+ // (128x128) |
+ // by ResourceBundleImageSource. |
+ {CursorType::kNull, IDR_AURA_CURSOR_BIG_PTR, {10, 10}, {20, 20}}, |
+ {CursorType::kPointer, IDR_AURA_CURSOR_BIG_PTR, {10, 10}, {20, 20}}, |
+ {CursorType::kNoDrop, IDR_AURA_CURSOR_BIG_NO_DROP, {10, 10}, {20, 20}}, |
+ {CursorType::kNotAllowed, IDR_AURA_CURSOR_BIG_NO_DROP, {10, 10}, {20, 20}}, |
+ {CursorType::kCopy, IDR_AURA_CURSOR_BIG_COPY, {10, 10}, {20, 20}}, |
+ {CursorType::kHand, IDR_AURA_CURSOR_BIG_HAND, {25, 7}, {50, 14}}, |
+ {CursorType::kMove, IDR_AURA_CURSOR_BIG_MOVE, {32, 31}, {64, 62}}, |
+ {CursorType::kNorthEastResize, |
+ IDR_AURA_CURSOR_BIG_NORTH_EAST_RESIZE, |
+ {31, 28}, |
+ {62, 56}}, |
+ {CursorType::kSouthWestResize, |
+ IDR_AURA_CURSOR_BIG_SOUTH_WEST_RESIZE, |
+ {31, 28}, |
+ {62, 56}}, |
+ {CursorType::kSouthEastResize, |
+ IDR_AURA_CURSOR_BIG_SOUTH_EAST_RESIZE, |
+ {28, 28}, |
+ {56, 56}}, |
+ {CursorType::kNorthWestResize, |
+ IDR_AURA_CURSOR_BIG_NORTH_WEST_RESIZE, |
+ {28, 28}, |
+ {56, 56}}, |
+ {CursorType::kNorthResize, |
+ IDR_AURA_CURSOR_BIG_NORTH_RESIZE, |
+ {29, 32}, |
+ {58, 64}}, |
+ {CursorType::kSouthResize, |
+ IDR_AURA_CURSOR_BIG_SOUTH_RESIZE, |
+ {29, 32}, |
+ {58, 64}}, |
+ {CursorType::kEastResize, |
+ IDR_AURA_CURSOR_BIG_EAST_RESIZE, |
+ {35, 29}, |
+ {70, 58}}, |
+ {CursorType::kWestResize, |
+ IDR_AURA_CURSOR_BIG_WEST_RESIZE, |
+ {35, 29}, |
+ {70, 58}}, |
+ {CursorType::kIBeam, IDR_AURA_CURSOR_BIG_IBEAM, {30, 32}, {60, 64}}, |
+ {CursorType::kAlias, IDR_AURA_CURSOR_BIG_ALIAS, {19, 11}, {38, 22}}, |
+ {CursorType::kCell, IDR_AURA_CURSOR_BIG_CELL, {30, 30}, {60, 60}}, |
+ {CursorType::kContextMenu, |
+ IDR_AURA_CURSOR_BIG_CONTEXT_MENU, |
+ {11, 11}, |
+ {22, 22}}, |
+ {CursorType::kCross, IDR_AURA_CURSOR_BIG_CROSSHAIR, {31, 30}, {62, 60}}, |
+ {CursorType::kHelp, IDR_AURA_CURSOR_BIG_HELP, {10, 11}, {20, 22}}, |
+ {CursorType::kVerticalText, |
+ IDR_AURA_CURSOR_BIG_XTERM_HORIZ, |
+ {32, 30}, |
+ {64, 60}}, |
+ {CursorType::kZoomIn, IDR_AURA_CURSOR_BIG_ZOOM_IN, {25, 26}, {50, 52}}, |
+ {CursorType::kZoomOut, IDR_AURA_CURSOR_BIG_ZOOM_OUT, {26, 26}, {52, 52}}, |
+ {CursorType::kRowResize, |
+ IDR_AURA_CURSOR_BIG_ROW_RESIZE, |
+ {29, 32}, |
+ {58, 64}}, |
+ {CursorType::kColumnResize, |
+ IDR_AURA_CURSOR_BIG_COL_RESIZE, |
+ {35, 29}, |
+ {70, 58}}, |
+ {CursorType::kEastWestResize, |
+ IDR_AURA_CURSOR_BIG_EAST_WEST_RESIZE, |
+ {35, 29}, |
+ {70, 58}}, |
+ {CursorType::kNorthSouthResize, |
+ IDR_AURA_CURSOR_BIG_NORTH_SOUTH_RESIZE, |
+ {29, 32}, |
+ {58, 64}}, |
+ {CursorType::kNorthEastSouthWestResize, |
+ IDR_AURA_CURSOR_BIG_NORTH_EAST_SOUTH_WEST_RESIZE, |
+ {32, 30}, |
+ {64, 60}}, |
+ {CursorType::kNorthWestSouthEastResize, |
+ IDR_AURA_CURSOR_BIG_NORTH_WEST_SOUTH_EAST_RESIZE, |
+ {32, 31}, |
+ {64, 62}}, |
+ {CursorType::kGrab, IDR_AURA_CURSOR_BIG_GRAB, {21, 11}, {42, 22}}, |
+ {CursorType::kGrabbing, IDR_AURA_CURSOR_BIG_GRABBING, {20, 12}, {40, 24}}, |
}; |
const CursorData kAnimatedCursors[] = { |
- {ui::kCursorWait, IDR_AURA_CURSOR_THROBBER, {7, 7}, {14, 14}}, |
- {ui::kCursorProgress, IDR_AURA_CURSOR_THROBBER, {7, 7}, {14, 14}}, |
+ {CursorType::kWait, IDR_AURA_CURSOR_THROBBER, {7, 7}, {14, 14}}, |
+ {CursorType::kProgress, IDR_AURA_CURSOR_THROBBER, {7, 7}, {14, 14}}, |
}; |
const CursorSet kCursorSets[] = { |
@@ -165,7 +227,7 @@ const CursorSet* GetCursorSetByType(CursorSetType cursor_set_id) { |
bool SearchTable(const CursorData* table, |
size_t table_length, |
- int id, |
+ CursorType id, |
float scale_factor, |
int* resource_id, |
gfx::Point* point) { |
@@ -188,7 +250,7 @@ bool SearchTable(const CursorData* table, |
} // namespace |
bool GetCursorDataFor(CursorSetType cursor_set_id, |
- int id, |
+ CursorType id, |
float scale_factor, |
int* resource_id, |
gfx::Point* point) { |
@@ -209,7 +271,7 @@ bool GetCursorDataFor(CursorSetType cursor_set_id, |
} |
bool GetAnimatedCursorDataFor(CursorSetType cursor_set_id, |
- int id, |
+ CursorType id, |
float scale_factor, |
int* resource_id, |
gfx::Point* point) { |