Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(718)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/cursor/cursors_aura.cc

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: Remove extranious ::ui:: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ui/base/cursor/cursor.h ('K') | « ui/base/cursor/cursors_aura.h ('k') | ui/base/cursor/image_cursors.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..2b66ce7d3f7a865ea54de383022327a8203bad24 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::CURSOR_NULL, IDR_AURA_CURSOR_PTR, {4, 4}, {7, 7}},
+ {CursorType::POINTER, IDR_AURA_CURSOR_PTR, {4, 4}, {7, 7}},
+ {CursorType::NO_DROP, IDR_AURA_CURSOR_NO_DROP, {9, 9}, {18, 18}},
+ {CursorType::NOT_ALLOWED, IDR_AURA_CURSOR_NO_DROP, {9, 9}, {18, 18}},
+ {CursorType::COPY, IDR_AURA_CURSOR_COPY, {9, 9}, {18, 18}},
+ {CursorType::HAND, IDR_AURA_CURSOR_HAND, {9, 4}, {19, 8}},
+ {CursorType::MOVE, IDR_AURA_CURSOR_MOVE, {11, 11}, {23, 23}},
+ {CursorType::NORTH_EAST_RESIZE,
+ IDR_AURA_CURSOR_NORTH_EAST_RESIZE,
+ {12, 11},
+ {25, 23}},
+ {CursorType::SOUTH_WEST_RESIZE,
+ IDR_AURA_CURSOR_SOUTH_WEST_RESIZE,
+ {12, 11},
+ {25, 23}},
+ {CursorType::SOUTH_EAST_RESIZE,
+ IDR_AURA_CURSOR_SOUTH_EAST_RESIZE,
+ {11, 11},
+ {24, 23}},
+ {CursorType::NORTH_WEST_RESIZE,
+ IDR_AURA_CURSOR_NORTH_WEST_RESIZE,
+ {11, 11},
+ {24, 23}},
+ {CursorType::NORTH_RESIZE,
+ IDR_AURA_CURSOR_NORTH_RESIZE,
+ {11, 12},
+ {23, 23}},
+ {CursorType::SOUTH_RESIZE,
+ IDR_AURA_CURSOR_SOUTH_RESIZE,
+ {11, 12},
+ {23, 23}},
+ {CursorType::EAST_RESIZE, IDR_AURA_CURSOR_EAST_RESIZE, {12, 11}, {25, 23}},
+ {CursorType::WEST_RESIZE, IDR_AURA_CURSOR_WEST_RESIZE, {12, 11}, {25, 23}},
+ {CursorType::IBEAM, IDR_AURA_CURSOR_IBEAM, {12, 12}, {24, 25}},
+ {CursorType::ALIAS, IDR_AURA_CURSOR_ALIAS, {8, 6}, {15, 11}},
+ {CursorType::CELL, IDR_AURA_CURSOR_CELL, {11, 11}, {24, 23}},
+ {CursorType::CONTEXT_MENU, IDR_AURA_CURSOR_CONTEXT_MENU, {4, 4}, {8, 9}},
+ {CursorType::CROSS, IDR_AURA_CURSOR_CROSSHAIR, {12, 12}, {25, 23}},
+ {CursorType::HELP, IDR_AURA_CURSOR_HELP, {4, 4}, {8, 9}},
+ {CursorType::VERTICAL_TEXT,
+ IDR_AURA_CURSOR_XTERM_HORIZ,
+ {12, 11},
+ {26, 23}},
+ {CursorType::ZOOM_IN, IDR_AURA_CURSOR_ZOOM_IN, {10, 10}, {20, 20}},
+ {CursorType::ZOOM_OUT, IDR_AURA_CURSOR_ZOOM_OUT, {10, 10}, {20, 20}},
+ {CursorType::ROW_RESIZE, IDR_AURA_CURSOR_ROW_RESIZE, {11, 12}, {23, 23}},
+ {CursorType::COLUMN_RESIZE, IDR_AURA_CURSOR_COL_RESIZE, {12, 11}, {25, 23}},
+ {CursorType::EAST_WEST_RESIZE,
+ IDR_AURA_CURSOR_EAST_WEST_RESIZE,
+ {12, 11},
+ {25, 23}},
+ {CursorType::NORTH_SOUTH_RESIZE,
+ IDR_AURA_CURSOR_NORTH_SOUTH_RESIZE,
+ {11, 12},
+ {23, 23}},
+ {CursorType::NORTH_EAST_SOUTH_WEST_RESIZE,
+ IDR_AURA_CURSOR_NORTH_EAST_SOUTH_WEST_RESIZE,
+ {12, 11},
+ {25, 23}},
+ {CursorType::NORTH_WEST_SOUTH_EAST_RESIZE,
+ IDR_AURA_CURSOR_NORTH_WEST_SOUTH_EAST_RESIZE,
+ {11, 11},
+ {24, 23}},
+ {CursorType::GRAB, IDR_AURA_CURSOR_GRAB, {8, 5}, {16, 10}},
+ {CursorType::GRABBING, 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::CURSOR_NULL, IDR_AURA_CURSOR_BIG_PTR, {10, 10}, {20, 20}},
+ {CursorType::POINTER, IDR_AURA_CURSOR_BIG_PTR, {10, 10}, {20, 20}},
+ {CursorType::NO_DROP, IDR_AURA_CURSOR_BIG_NO_DROP, {10, 10}, {20, 20}},
+ {CursorType::NOT_ALLOWED, IDR_AURA_CURSOR_BIG_NO_DROP, {10, 10}, {20, 20}},
+ {CursorType::COPY, IDR_AURA_CURSOR_BIG_COPY, {10, 10}, {20, 20}},
+ {CursorType::HAND, IDR_AURA_CURSOR_BIG_HAND, {25, 7}, {50, 14}},
+ {CursorType::MOVE, IDR_AURA_CURSOR_BIG_MOVE, {32, 31}, {64, 62}},
+ {CursorType::NORTH_EAST_RESIZE,
+ IDR_AURA_CURSOR_BIG_NORTH_EAST_RESIZE,
+ {31, 28},
+ {62, 56}},
+ {CursorType::SOUTH_WEST_RESIZE,
+ IDR_AURA_CURSOR_BIG_SOUTH_WEST_RESIZE,
+ {31, 28},
+ {62, 56}},
+ {CursorType::SOUTH_EAST_RESIZE,
+ IDR_AURA_CURSOR_BIG_SOUTH_EAST_RESIZE,
+ {28, 28},
+ {56, 56}},
+ {CursorType::NORTH_WEST_RESIZE,
+ IDR_AURA_CURSOR_BIG_NORTH_WEST_RESIZE,
+ {28, 28},
+ {56, 56}},
+ {CursorType::NORTH_RESIZE,
+ IDR_AURA_CURSOR_BIG_NORTH_RESIZE,
+ {29, 32},
+ {58, 64}},
+ {CursorType::SOUTH_RESIZE,
+ IDR_AURA_CURSOR_BIG_SOUTH_RESIZE,
+ {29, 32},
+ {58, 64}},
+ {CursorType::EAST_RESIZE,
+ IDR_AURA_CURSOR_BIG_EAST_RESIZE,
+ {35, 29},
+ {70, 58}},
+ {CursorType::WEST_RESIZE,
+ IDR_AURA_CURSOR_BIG_WEST_RESIZE,
+ {35, 29},
+ {70, 58}},
+ {CursorType::IBEAM, IDR_AURA_CURSOR_BIG_IBEAM, {30, 32}, {60, 64}},
+ {CursorType::ALIAS, IDR_AURA_CURSOR_BIG_ALIAS, {19, 11}, {38, 22}},
+ {CursorType::CELL, IDR_AURA_CURSOR_BIG_CELL, {30, 30}, {60, 60}},
+ {CursorType::CONTEXT_MENU,
+ IDR_AURA_CURSOR_BIG_CONTEXT_MENU,
+ {11, 11},
+ {22, 22}},
+ {CursorType::CROSS, IDR_AURA_CURSOR_BIG_CROSSHAIR, {31, 30}, {62, 60}},
+ {CursorType::HELP, IDR_AURA_CURSOR_BIG_HELP, {10, 11}, {20, 22}},
+ {CursorType::VERTICAL_TEXT,
+ IDR_AURA_CURSOR_BIG_XTERM_HORIZ,
+ {32, 30},
+ {64, 60}},
+ {CursorType::ZOOM_IN, IDR_AURA_CURSOR_BIG_ZOOM_IN, {25, 26}, {50, 52}},
+ {CursorType::ZOOM_OUT, IDR_AURA_CURSOR_BIG_ZOOM_OUT, {26, 26}, {52, 52}},
+ {CursorType::ROW_RESIZE,
+ IDR_AURA_CURSOR_BIG_ROW_RESIZE,
+ {29, 32},
+ {58, 64}},
+ {CursorType::COLUMN_RESIZE,
+ IDR_AURA_CURSOR_BIG_COL_RESIZE,
+ {35, 29},
+ {70, 58}},
+ {CursorType::EAST_WEST_RESIZE,
+ IDR_AURA_CURSOR_BIG_EAST_WEST_RESIZE,
+ {35, 29},
+ {70, 58}},
+ {CursorType::NORTH_SOUTH_RESIZE,
+ IDR_AURA_CURSOR_BIG_NORTH_SOUTH_RESIZE,
+ {29, 32},
+ {58, 64}},
+ {CursorType::NORTH_EAST_SOUTH_WEST_RESIZE,
+ IDR_AURA_CURSOR_BIG_NORTH_EAST_SOUTH_WEST_RESIZE,
+ {32, 30},
+ {64, 60}},
+ {CursorType::NORTH_WEST_SOUTH_EAST_RESIZE,
+ IDR_AURA_CURSOR_BIG_NORTH_WEST_SOUTH_EAST_RESIZE,
+ {32, 31},
+ {64, 62}},
+ {CursorType::GRAB, IDR_AURA_CURSOR_BIG_GRAB, {21, 11}, {42, 22}},
+ {CursorType::GRABBING, 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::WAIT, IDR_AURA_CURSOR_THROBBER, {7, 7}, {14, 14}},
+ {CursorType::PROGRESS, 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) {
« ui/base/cursor/cursor.h ('K') | « ui/base/cursor/cursors_aura.h ('k') | ui/base/cursor/image_cursors.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698