mirror of
https://github.com/servo/servo.git
synced 2025-07-15 19:33:46 +01:00
Auto merge of #11696 - mrmiywj:rename-to-less-repetitive, r=ConnorGBrewster
use less repetitive name <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #11689 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because just renaming <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11696) <!-- Reviewable:end -->
This commit is contained in:
bors-servo
GitHub
commit
b5115fc895
6 changed files with 162 additions and 162 deletions
|
|
@ -377,7 +377,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
let base = state.create_base_display_item(&bounds,
|
let base = state.create_base_display_item(&bounds,
|
||||||
&clip,
|
&clip,
|
||||||
self.node,
|
self.node,
|
||||||
style.get_cursor(Cursor::DefaultCursor),
|
style.get_cursor(Cursor::Default),
|
||||||
display_list_section);
|
display_list_section);
|
||||||
state.add_display_item(
|
state.add_display_item(
|
||||||
DisplayItem::SolidColorClass(box SolidColorDisplayItem {
|
DisplayItem::SolidColorClass(box SolidColorDisplayItem {
|
||||||
|
|
@ -569,7 +569,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
let base = state.create_base_display_item(&bounds,
|
let base = state.create_base_display_item(&bounds,
|
||||||
&clip,
|
&clip,
|
||||||
self.node,
|
self.node,
|
||||||
style.get_cursor(Cursor::DefaultCursor),
|
style.get_cursor(Cursor::Default),
|
||||||
display_list_section);
|
display_list_section);
|
||||||
state.add_display_item(DisplayItem::ImageClass(box ImageDisplayItem {
|
state.add_display_item(DisplayItem::ImageClass(box ImageDisplayItem {
|
||||||
base: base,
|
base: base,
|
||||||
|
|
@ -697,7 +697,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
let base = state.create_base_display_item(absolute_bounds,
|
let base = state.create_base_display_item(absolute_bounds,
|
||||||
&clip,
|
&clip,
|
||||||
self.node,
|
self.node,
|
||||||
style.get_cursor(Cursor::DefaultCursor),
|
style.get_cursor(Cursor::Default),
|
||||||
display_list_section);
|
display_list_section);
|
||||||
let gradient_display_item = DisplayItem::GradientClass(box GradientDisplayItem {
|
let gradient_display_item = DisplayItem::GradientClass(box GradientDisplayItem {
|
||||||
base: base,
|
base: base,
|
||||||
|
|
@ -727,7 +727,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
let base = state.create_base_display_item(&bounds,
|
let base = state.create_base_display_item(&bounds,
|
||||||
&clip,
|
&clip,
|
||||||
self.node,
|
self.node,
|
||||||
style.get_cursor(Cursor::DefaultCursor),
|
style.get_cursor(Cursor::Default),
|
||||||
display_list_section);
|
display_list_section);
|
||||||
state.add_display_item(DisplayItem::BoxShadowClass(box BoxShadowDisplayItem {
|
state.add_display_item(DisplayItem::BoxShadowClass(box BoxShadowDisplayItem {
|
||||||
base: base,
|
base: base,
|
||||||
|
|
@ -799,7 +799,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
let base = state.create_base_display_item(&bounds,
|
let base = state.create_base_display_item(&bounds,
|
||||||
&clip,
|
&clip,
|
||||||
self.node,
|
self.node,
|
||||||
style.get_cursor(Cursor::DefaultCursor),
|
style.get_cursor(Cursor::Default),
|
||||||
display_list_section);
|
display_list_section);
|
||||||
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
|
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
|
||||||
base: base,
|
base: base,
|
||||||
|
|
@ -842,7 +842,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
let base = state.create_base_display_item(&bounds,
|
let base = state.create_base_display_item(&bounds,
|
||||||
&clip,
|
&clip,
|
||||||
self.node,
|
self.node,
|
||||||
style.get_cursor(Cursor::DefaultCursor),
|
style.get_cursor(Cursor::Default),
|
||||||
DisplayListSection::Outlines);
|
DisplayListSection::Outlines);
|
||||||
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
|
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
|
||||||
base: base,
|
base: base,
|
||||||
|
|
@ -867,7 +867,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
let base = state.create_base_display_item(stacking_relative_border_box,
|
let base = state.create_base_display_item(stacking_relative_border_box,
|
||||||
clip,
|
clip,
|
||||||
self.node,
|
self.node,
|
||||||
style.get_cursor(Cursor::DefaultCursor),
|
style.get_cursor(Cursor::Default),
|
||||||
DisplayListSection::Content);
|
DisplayListSection::Content);
|
||||||
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
|
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
|
||||||
base: base,
|
base: base,
|
||||||
|
|
@ -888,7 +888,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
let base = state.create_base_display_item(&baseline,
|
let base = state.create_base_display_item(&baseline,
|
||||||
clip,
|
clip,
|
||||||
self.node,
|
self.node,
|
||||||
style.get_cursor(Cursor::DefaultCursor),
|
style.get_cursor(Cursor::Default),
|
||||||
DisplayListSection::Content);
|
DisplayListSection::Content);
|
||||||
state.add_display_item(DisplayItem::LineClass(box LineDisplayItem {
|
state.add_display_item(DisplayItem::LineClass(box LineDisplayItem {
|
||||||
base: base,
|
base: base,
|
||||||
|
|
@ -905,7 +905,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
let base = state.create_base_display_item(stacking_relative_border_box,
|
let base = state.create_base_display_item(stacking_relative_border_box,
|
||||||
clip,
|
clip,
|
||||||
self.node,
|
self.node,
|
||||||
self.style.get_cursor(Cursor::DefaultCursor),
|
self.style.get_cursor(Cursor::Default),
|
||||||
DisplayListSection::Content);
|
DisplayListSection::Content);
|
||||||
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
|
state.add_display_item(DisplayItem::BorderClass(box BorderDisplayItem {
|
||||||
base: base,
|
base: base,
|
||||||
|
|
@ -956,7 +956,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
let base = state.create_base_display_item(stacking_relative_border_box,
|
let base = state.create_base_display_item(stacking_relative_border_box,
|
||||||
&clip,
|
&clip,
|
||||||
self.node,
|
self.node,
|
||||||
self.style.get_cursor(Cursor::DefaultCursor),
|
self.style.get_cursor(Cursor::Default),
|
||||||
display_list_section);
|
display_list_section);
|
||||||
state.add_display_item(
|
state.add_display_item(
|
||||||
DisplayItem::SolidColorClass(box SolidColorDisplayItem {
|
DisplayItem::SolidColorClass(box SolidColorDisplayItem {
|
||||||
|
|
@ -981,14 +981,14 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
stacking_relative_border_box.origin.y),
|
stacking_relative_border_box.origin.y),
|
||||||
Size2D::new(INSERTION_POINT_LOGICAL_WIDTH,
|
Size2D::new(INSERTION_POINT_LOGICAL_WIDTH,
|
||||||
stacking_relative_border_box.size.height));
|
stacking_relative_border_box.size.height));
|
||||||
cursor = Cursor::TextCursor;
|
cursor = Cursor::Text;
|
||||||
} else {
|
} else {
|
||||||
insertion_point_bounds =
|
insertion_point_bounds =
|
||||||
Rect::new(Point2D::new(stacking_relative_border_box.origin.x,
|
Rect::new(Point2D::new(stacking_relative_border_box.origin.x,
|
||||||
stacking_relative_border_box.origin.y + advance),
|
stacking_relative_border_box.origin.y + advance),
|
||||||
Size2D::new(stacking_relative_border_box.size.width,
|
Size2D::new(stacking_relative_border_box.size.width,
|
||||||
INSERTION_POINT_LOGICAL_WIDTH));
|
INSERTION_POINT_LOGICAL_WIDTH));
|
||||||
cursor = Cursor::VerticalTextCursor;
|
cursor = Cursor::VerticalText;
|
||||||
};
|
};
|
||||||
|
|
||||||
let base = state.create_base_display_item(&insertion_point_bounds,
|
let base = state.create_base_display_item(&insertion_point_bounds,
|
||||||
|
|
@ -1208,7 +1208,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
&stacking_relative_content_box,
|
&stacking_relative_content_box,
|
||||||
clip,
|
clip,
|
||||||
self.node,
|
self.node,
|
||||||
self.style.get_cursor(Cursor::DefaultCursor),
|
self.style.get_cursor(Cursor::Default),
|
||||||
DisplayListSection::Content);
|
DisplayListSection::Content);
|
||||||
let item = DisplayItem::IframeClass(box IframeDisplayItem {
|
let item = DisplayItem::IframeClass(box IframeDisplayItem {
|
||||||
base: base,
|
base: base,
|
||||||
|
|
@ -1235,7 +1235,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
&stacking_relative_content_box,
|
&stacking_relative_content_box,
|
||||||
clip,
|
clip,
|
||||||
self.node,
|
self.node,
|
||||||
self.style.get_cursor(Cursor::DefaultCursor),
|
self.style.get_cursor(Cursor::Default),
|
||||||
DisplayListSection::Content);
|
DisplayListSection::Content);
|
||||||
state.add_display_item(DisplayItem::ImageClass(box ImageDisplayItem {
|
state.add_display_item(DisplayItem::ImageClass(box ImageDisplayItem {
|
||||||
base: base,
|
base: base,
|
||||||
|
|
@ -1271,7 +1271,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
&stacking_relative_content_box,
|
&stacking_relative_content_box,
|
||||||
clip,
|
clip,
|
||||||
self.node,
|
self.node,
|
||||||
self.style.get_cursor(Cursor::DefaultCursor),
|
self.style.get_cursor(Cursor::Default),
|
||||||
DisplayListSection::Content);
|
DisplayListSection::Content);
|
||||||
let display_item = match canvas_data {
|
let display_item = match canvas_data {
|
||||||
CanvasData::Pixels(canvas_data) => {
|
CanvasData::Pixels(canvas_data) => {
|
||||||
|
|
@ -1545,12 +1545,12 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
// Determine the orientation and cursor to use.
|
// Determine the orientation and cursor to use.
|
||||||
let (orientation, cursor) = if self.style.writing_mode.is_vertical() {
|
let (orientation, cursor) = if self.style.writing_mode.is_vertical() {
|
||||||
if self.style.writing_mode.is_sideways_left() {
|
if self.style.writing_mode.is_sideways_left() {
|
||||||
(TextOrientation::SidewaysLeft, Cursor::VerticalTextCursor)
|
(TextOrientation::SidewaysLeft, Cursor::VerticalText)
|
||||||
} else {
|
} else {
|
||||||
(TextOrientation::SidewaysRight, Cursor::VerticalTextCursor)
|
(TextOrientation::SidewaysRight, Cursor::VerticalText)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
(TextOrientation::Upright, Cursor::TextCursor)
|
(TextOrientation::Upright, Cursor::Text)
|
||||||
};
|
};
|
||||||
|
|
||||||
// Compute location of the baseline.
|
// Compute location of the baseline.
|
||||||
|
|
@ -1649,7 +1649,7 @@ impl FragmentDisplayListBuilding for Fragment {
|
||||||
&shadow_bounds(&stacking_relative_box, blur_radius, Au(0)),
|
&shadow_bounds(&stacking_relative_box, blur_radius, Au(0)),
|
||||||
clip,
|
clip,
|
||||||
self.node,
|
self.node,
|
||||||
self.style.get_cursor(Cursor::DefaultCursor),
|
self.style.get_cursor(Cursor::Default),
|
||||||
DisplayListSection::Content);
|
DisplayListSection::Content);
|
||||||
state.add_display_item(DisplayItem::BoxShadowClass(box BoxShadowDisplayItem {
|
state.add_display_item(DisplayItem::BoxShadowClass(box BoxShadowDisplayItem {
|
||||||
base: base,
|
base: base,
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ impl LayoutRPC for LayoutRPCImpl {
|
||||||
if update_cursor {
|
if update_cursor {
|
||||||
// Compute the new cursor.
|
// Compute the new cursor.
|
||||||
let cursor = match *result {
|
let cursor = match *result {
|
||||||
None => Cursor::DefaultCursor,
|
None => Cursor::Default,
|
||||||
Some(dim) => dim.pointing.unwrap(),
|
Some(dim) => dim.pointing.unwrap(),
|
||||||
};
|
};
|
||||||
rw_data.constellation_chan.send(ConstellationMsg::SetCursor(cursor)).unwrap();
|
rw_data.constellation_chan.send(ConstellationMsg::SetCursor(cursor)).unwrap();
|
||||||
|
|
|
||||||
|
|
@ -35,39 +35,39 @@ macro_rules! define_cursor {
|
||||||
|
|
||||||
|
|
||||||
define_cursor! {
|
define_cursor! {
|
||||||
"none" => NoCursor = 0,
|
"none" => None = 0,
|
||||||
"default" => DefaultCursor = 1,
|
"default" => Default = 1,
|
||||||
"pointer" => PointerCursor = 2,
|
"pointer" => Pointer = 2,
|
||||||
"context-menu" => ContextMenuCursor = 3,
|
"context-menu" => ContextMenu = 3,
|
||||||
"help" => HelpCursor = 4,
|
"help" => Help = 4,
|
||||||
"progress" => ProgressCursor = 5,
|
"progress" => Progress = 5,
|
||||||
"wait" => WaitCursor = 6,
|
"wait" => Wait = 6,
|
||||||
"cell" => CellCursor = 7,
|
"cell" => Cell = 7,
|
||||||
"crosshair" => CrosshairCursor = 8,
|
"crosshair" => Crosshair = 8,
|
||||||
"text" => TextCursor = 9,
|
"text" => Text = 9,
|
||||||
"vertical-text" => VerticalTextCursor = 10,
|
"vertical-text" => VerticalText = 10,
|
||||||
"alias" => AliasCursor = 11,
|
"alias" => Alias = 11,
|
||||||
"copy" => CopyCursor = 12,
|
"copy" => Copy = 12,
|
||||||
"move" => MoveCursor = 13,
|
"move" => Move = 13,
|
||||||
"no-drop" => NoDropCursor = 14,
|
"no-drop" => NoDrop = 14,
|
||||||
"not-allowed" => NotAllowedCursor = 15,
|
"not-allowed" => NotAllowed = 15,
|
||||||
"grab" => GrabCursor = 16,
|
"grab" => Grab = 16,
|
||||||
"grabbing" => GrabbingCursor = 17,
|
"grabbing" => Grabbing = 17,
|
||||||
"e-resize" => EResizeCursor = 18,
|
"e-resize" => EResize = 18,
|
||||||
"n-resize" => NResizeCursor = 19,
|
"n-resize" => NResize = 19,
|
||||||
"ne-resize" => NeResizeCursor = 20,
|
"ne-resize" => NeResize = 20,
|
||||||
"nw-resize" => NwResizeCursor = 21,
|
"nw-resize" => NwResize = 21,
|
||||||
"s-resize" => SResizeCursor = 22,
|
"s-resize" => SResize = 22,
|
||||||
"se-resize" => SeResizeCursor = 23,
|
"se-resize" => SeResize = 23,
|
||||||
"sw-resize" => SwResizeCursor = 24,
|
"sw-resize" => SwResize = 24,
|
||||||
"w-resize" => WResizeCursor = 25,
|
"w-resize" => WResize = 25,
|
||||||
"ew-resize" => EwResizeCursor = 26,
|
"ew-resize" => EwResize = 26,
|
||||||
"ns-resize" => NsResizeCursor = 27,
|
"ns-resize" => NsResize = 27,
|
||||||
"nesw-resize" => NeswResizeCursor = 28,
|
"nesw-resize" => NeswResize = 28,
|
||||||
"nwse-resize" => NwseResizeCursor = 29,
|
"nwse-resize" => NwseResize = 29,
|
||||||
"col-resize" => ColResizeCursor = 30,
|
"col-resize" => ColResize = 30,
|
||||||
"row-resize" => RowResizeCursor = 31,
|
"row-resize" => RowResize = 31,
|
||||||
"all-scroll" => AllScrollCursor = 32,
|
"all-scroll" => AllScroll = 32,
|
||||||
"zoom-in" => ZoomInCursor = 33,
|
"zoom-in" => ZoomIn = 33,
|
||||||
"zoom-out" => ZoomOutCursor = 34,
|
"zoom-out" => ZoomOut = 34,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -105,27 +105,27 @@ impl Window {
|
||||||
|
|
||||||
fn cursor_type_for_cursor(&self, cursor: Cursor) -> cef_cursor_type_t {
|
fn cursor_type_for_cursor(&self, cursor: Cursor) -> cef_cursor_type_t {
|
||||||
match cursor {
|
match cursor {
|
||||||
Cursor::NoCursor => return cef_cursor_type_t::CT_NONE,
|
Cursor::None => return cef_cursor_type_t::CT_NONE,
|
||||||
Cursor::ContextMenuCursor => return cef_cursor_type_t::CT_CONTEXTMENU,
|
Cursor::ContextMenu => return cef_cursor_type_t::CT_CONTEXTMENU,
|
||||||
Cursor::GrabbingCursor => return cef_cursor_type_t::CT_GRABBING,
|
Cursor::Grabbing => return cef_cursor_type_t::CT_GRABBING,
|
||||||
Cursor::CrosshairCursor => return cef_cursor_type_t::CT_CROSS,
|
Cursor::Crosshair => return cef_cursor_type_t::CT_CROSS,
|
||||||
Cursor::CopyCursor => return cef_cursor_type_t::CT_COPY,
|
Cursor::Copy => return cef_cursor_type_t::CT_COPY,
|
||||||
Cursor::AliasCursor => return cef_cursor_type_t::CT_ALIAS,
|
Cursor::Alias => return cef_cursor_type_t::CT_ALIAS,
|
||||||
Cursor::TextCursor => return cef_cursor_type_t::CT_IBEAM,
|
Cursor::Text => return cef_cursor_type_t::CT_IBEAM,
|
||||||
Cursor::GrabCursor | Cursor::AllScrollCursor =>
|
Cursor::Grab | Cursor::AllScroll =>
|
||||||
return cef_cursor_type_t::CT_GRAB,
|
return cef_cursor_type_t::CT_GRAB,
|
||||||
Cursor::NoDropCursor => return cef_cursor_type_t::CT_NODROP,
|
Cursor::NoDrop => return cef_cursor_type_t::CT_NODROP,
|
||||||
Cursor::NotAllowedCursor => return cef_cursor_type_t::CT_NOTALLOWED,
|
Cursor::NotAllowed => return cef_cursor_type_t::CT_NOTALLOWED,
|
||||||
Cursor::PointerCursor => return cef_cursor_type_t::CT_POINTER,
|
Cursor::Pointer => return cef_cursor_type_t::CT_POINTER,
|
||||||
Cursor::SResizeCursor => return cef_cursor_type_t::CT_SOUTHRESIZE,
|
Cursor::SResize => return cef_cursor_type_t::CT_SOUTHRESIZE,
|
||||||
Cursor::WResizeCursor => return cef_cursor_type_t::CT_WESTRESIZE,
|
Cursor::WResize => return cef_cursor_type_t::CT_WESTRESIZE,
|
||||||
Cursor::EwResizeCursor => return cef_cursor_type_t::CT_EASTWESTRESIZE,
|
Cursor::EwResize => return cef_cursor_type_t::CT_EASTWESTRESIZE,
|
||||||
Cursor::ColResizeCursor => return cef_cursor_type_t::CT_COLUMNRESIZE,
|
Cursor::ColResize => return cef_cursor_type_t::CT_COLUMNRESIZE,
|
||||||
Cursor::EResizeCursor => return cef_cursor_type_t::CT_EASTRESIZE,
|
Cursor::EResize => return cef_cursor_type_t::CT_EASTRESIZE,
|
||||||
Cursor::NResizeCursor => return cef_cursor_type_t::CT_NORTHRESIZE,
|
Cursor::NResize => return cef_cursor_type_t::CT_NORTHRESIZE,
|
||||||
Cursor::NsResizeCursor => return cef_cursor_type_t::CT_NORTHSOUTHRESIZE,
|
Cursor::NsResize => return cef_cursor_type_t::CT_NORTHSOUTHRESIZE,
|
||||||
Cursor::RowResizeCursor => return cef_cursor_type_t::CT_ROWRESIZE,
|
Cursor::RowResize => return cef_cursor_type_t::CT_ROWRESIZE,
|
||||||
Cursor::VerticalTextCursor => return cef_cursor_type_t::CT_VERTICALTEXT,
|
Cursor::VerticalText => return cef_cursor_type_t::CT_VERTICALTEXT,
|
||||||
_ => return cef_cursor_type_t::CT_POINTER,
|
_ => return cef_cursor_type_t::CT_POINTER,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -138,27 +138,27 @@ impl Window {
|
||||||
|
|
||||||
unsafe {
|
unsafe {
|
||||||
match cursor {
|
match cursor {
|
||||||
Cursor::NoCursor => return 0 as cef_cursor_handle_t,
|
Cursor::None => return 0 as cef_cursor_handle_t,
|
||||||
Cursor::ContextMenuCursor => msg_send![class("NSCursor"), contextualMenuCursor],
|
Cursor::ContextMenu => msg_send![class("NSCursor"), contextualMenuCursor],
|
||||||
Cursor::GrabbingCursor => msg_send![class("NSCursor"), closedHandCursor],
|
Cursor::Grabbing => msg_send![class("NSCursor"), closedHandCursor],
|
||||||
Cursor::CrosshairCursor => msg_send![class("NSCursor"), crosshairCursor],
|
Cursor::Crosshair => msg_send![class("NSCursor"), crosshairCursor],
|
||||||
Cursor::CopyCursor => msg_send![class("NSCursor"), dragCopyCursor],
|
Cursor::Copy => msg_send![class("NSCursor"), dragCopyCursor],
|
||||||
Cursor::AliasCursor => msg_send![class("NSCursor"), dragLinkCursor],
|
Cursor::Alias => msg_send![class("NSCursor"), dragLinkCursor],
|
||||||
Cursor::TextCursor => msg_send![class("NSCursor"), IBeamCursor],
|
Cursor::Text => msg_send![class("NSCursor"), IBeamCursor],
|
||||||
Cursor::GrabCursor | Cursor::AllScrollCursor =>
|
Cursor::Grab | Cursor::AllScroll =>
|
||||||
msg_send![class("NSCursor"), openHandCursor],
|
msg_send![class("NSCursor"), openHandCursor],
|
||||||
Cursor::NoDropCursor | Cursor::NotAllowedCursor =>
|
Cursor::NoDrop | Cursor::NotAllowed =>
|
||||||
msg_send![class("NSCursor"), operationNotAllowedCursor],
|
msg_send![class("NSCursor"), operationNotAllowedCursor],
|
||||||
Cursor::PointerCursor => msg_send![class("NSCursor"), pointingHandCursor],
|
Cursor::Pointer => msg_send![class("NSCursor"), pointingHandCursor],
|
||||||
Cursor::SResizeCursor => msg_send![class("NSCursor"), resizeDownCursor],
|
Cursor::SResize => msg_send![class("NSCursor"), resizeDownCursor],
|
||||||
Cursor::WResizeCursor => msg_send![class("NSCursor"), resizeLeftCursor],
|
Cursor::WResize => msg_send![class("NSCursor"), resizeLeftCursor],
|
||||||
Cursor::EwResizeCursor | Cursor::ColResizeCursor =>
|
Cursor::EwResize | Cursor::ColResize =>
|
||||||
msg_send![class("NSCursor"), resizeLeftRightCursor],
|
msg_send![class("NSCursor"), resizeLeftRightCursor],
|
||||||
Cursor::EResizeCursor => msg_send![class("NSCursor"), resizeRightCursor],
|
Cursor::EResize => msg_send![class("NSCursor"), resizeRightCursor],
|
||||||
Cursor::NResizeCursor => msg_send![class("NSCursor"), resizeUpCursor],
|
Cursor::NResize => msg_send![class("NSCursor"), resizeUpCursor],
|
||||||
Cursor::NsResizeCursor | Cursor::RowResizeCursor =>
|
Cursor::NsResize | Cursor::RowResize =>
|
||||||
msg_send![class("NSCursor"), resizeUpDownCursor],
|
msg_send![class("NSCursor"), resizeUpDownCursor],
|
||||||
Cursor::VerticalTextCursor => msg_send![class("NSCursor"), IBeamCursorForVerticalLayout],
|
Cursor::VerticalText => msg_send![class("NSCursor"), IBeamCursorForVerticalLayout],
|
||||||
_ => msg_send![class("NSCursor"), arrowCursor],
|
_ => msg_send![class("NSCursor"), arrowCursor],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -977,41 +977,41 @@ fn static_assert() {
|
||||||
self.gecko.mCursor = match v {
|
self.gecko.mCursor = match v {
|
||||||
T::AutoCursor => structs::NS_STYLE_CURSOR_AUTO,
|
T::AutoCursor => structs::NS_STYLE_CURSOR_AUTO,
|
||||||
T::SpecifiedCursor(cursor) => match cursor {
|
T::SpecifiedCursor(cursor) => match cursor {
|
||||||
Cursor::NoCursor => structs::NS_STYLE_CURSOR_NONE,
|
Cursor::None => structs::NS_STYLE_CURSOR_NONE,
|
||||||
Cursor::DefaultCursor => structs::NS_STYLE_CURSOR_DEFAULT,
|
Cursor::Default => structs::NS_STYLE_CURSOR_DEFAULT,
|
||||||
Cursor::PointerCursor => structs::NS_STYLE_CURSOR_POINTER,
|
Cursor::Pointer => structs::NS_STYLE_CURSOR_POINTER,
|
||||||
Cursor::ContextMenuCursor => structs::NS_STYLE_CURSOR_CONTEXT_MENU,
|
Cursor::ContextMenu => structs::NS_STYLE_CURSOR_CONTEXT_MENU,
|
||||||
Cursor::HelpCursor => structs::NS_STYLE_CURSOR_HELP,
|
Cursor::Help => structs::NS_STYLE_CURSOR_HELP,
|
||||||
Cursor::ProgressCursor => structs::NS_STYLE_CURSOR_DEFAULT, // Gecko doesn't support "progress" yet
|
Cursor::Progress => structs::NS_STYLE_CURSOR_DEFAULT, // Gecko doesn't support "progress" yet
|
||||||
Cursor::WaitCursor => structs::NS_STYLE_CURSOR_WAIT,
|
Cursor::Wait => structs::NS_STYLE_CURSOR_WAIT,
|
||||||
Cursor::CellCursor => structs::NS_STYLE_CURSOR_CELL,
|
Cursor::Cell => structs::NS_STYLE_CURSOR_CELL,
|
||||||
Cursor::CrosshairCursor => structs::NS_STYLE_CURSOR_CROSSHAIR,
|
Cursor::Crosshair => structs::NS_STYLE_CURSOR_CROSSHAIR,
|
||||||
Cursor::TextCursor => structs::NS_STYLE_CURSOR_TEXT,
|
Cursor::Text => structs::NS_STYLE_CURSOR_TEXT,
|
||||||
Cursor::VerticalTextCursor => structs::NS_STYLE_CURSOR_VERTICAL_TEXT,
|
Cursor::VerticalText => structs::NS_STYLE_CURSOR_VERTICAL_TEXT,
|
||||||
Cursor::AliasCursor => structs::NS_STYLE_CURSOR_ALIAS,
|
Cursor::Alias => structs::NS_STYLE_CURSOR_ALIAS,
|
||||||
Cursor::CopyCursor => structs::NS_STYLE_CURSOR_COPY,
|
Cursor::Copy => structs::NS_STYLE_CURSOR_COPY,
|
||||||
Cursor::MoveCursor => structs::NS_STYLE_CURSOR_MOVE,
|
Cursor::Move => structs::NS_STYLE_CURSOR_MOVE,
|
||||||
Cursor::NoDropCursor => structs::NS_STYLE_CURSOR_NO_DROP,
|
Cursor::NoDrop => structs::NS_STYLE_CURSOR_NO_DROP,
|
||||||
Cursor::NotAllowedCursor => structs::NS_STYLE_CURSOR_NOT_ALLOWED,
|
Cursor::NotAllowed => structs::NS_STYLE_CURSOR_NOT_ALLOWED,
|
||||||
Cursor::GrabCursor => structs::NS_STYLE_CURSOR_GRAB,
|
Cursor::Grab => structs::NS_STYLE_CURSOR_GRAB,
|
||||||
Cursor::GrabbingCursor => structs::NS_STYLE_CURSOR_GRABBING,
|
Cursor::Grabbing => structs::NS_STYLE_CURSOR_GRABBING,
|
||||||
Cursor::EResizeCursor => structs::NS_STYLE_CURSOR_E_RESIZE,
|
Cursor::EResize => structs::NS_STYLE_CURSOR_E_RESIZE,
|
||||||
Cursor::NResizeCursor => structs::NS_STYLE_CURSOR_N_RESIZE,
|
Cursor::NResize => structs::NS_STYLE_CURSOR_N_RESIZE,
|
||||||
Cursor::NeResizeCursor => structs::NS_STYLE_CURSOR_NE_RESIZE,
|
Cursor::NeResize => structs::NS_STYLE_CURSOR_NE_RESIZE,
|
||||||
Cursor::NwResizeCursor => structs::NS_STYLE_CURSOR_NW_RESIZE,
|
Cursor::NwResize => structs::NS_STYLE_CURSOR_NW_RESIZE,
|
||||||
Cursor::SResizeCursor => structs::NS_STYLE_CURSOR_S_RESIZE,
|
Cursor::SResize => structs::NS_STYLE_CURSOR_S_RESIZE,
|
||||||
Cursor::SeResizeCursor => structs::NS_STYLE_CURSOR_SE_RESIZE,
|
Cursor::SeResize => structs::NS_STYLE_CURSOR_SE_RESIZE,
|
||||||
Cursor::SwResizeCursor => structs::NS_STYLE_CURSOR_SW_RESIZE,
|
Cursor::SwResize => structs::NS_STYLE_CURSOR_SW_RESIZE,
|
||||||
Cursor::WResizeCursor => structs::NS_STYLE_CURSOR_W_RESIZE,
|
Cursor::WResize => structs::NS_STYLE_CURSOR_W_RESIZE,
|
||||||
Cursor::EwResizeCursor => structs::NS_STYLE_CURSOR_EW_RESIZE,
|
Cursor::EwResize => structs::NS_STYLE_CURSOR_EW_RESIZE,
|
||||||
Cursor::NsResizeCursor => structs::NS_STYLE_CURSOR_NS_RESIZE,
|
Cursor::NsResize => structs::NS_STYLE_CURSOR_NS_RESIZE,
|
||||||
Cursor::NeswResizeCursor => structs::NS_STYLE_CURSOR_NESW_RESIZE,
|
Cursor::NeswResize => structs::NS_STYLE_CURSOR_NESW_RESIZE,
|
||||||
Cursor::NwseResizeCursor => structs::NS_STYLE_CURSOR_NWSE_RESIZE,
|
Cursor::NwseResize => structs::NS_STYLE_CURSOR_NWSE_RESIZE,
|
||||||
Cursor::ColResizeCursor => structs::NS_STYLE_CURSOR_COL_RESIZE,
|
Cursor::ColResize => structs::NS_STYLE_CURSOR_COL_RESIZE,
|
||||||
Cursor::RowResizeCursor => structs::NS_STYLE_CURSOR_ROW_RESIZE,
|
Cursor::RowResize => structs::NS_STYLE_CURSOR_ROW_RESIZE,
|
||||||
Cursor::AllScrollCursor => structs::NS_STYLE_CURSOR_ALL_SCROLL,
|
Cursor::AllScroll => structs::NS_STYLE_CURSOR_ALL_SCROLL,
|
||||||
Cursor::ZoomInCursor => structs::NS_STYLE_CURSOR_ZOOM_IN,
|
Cursor::ZoomIn => structs::NS_STYLE_CURSOR_ZOOM_IN,
|
||||||
Cursor::ZoomOutCursor => structs::NS_STYLE_CURSOR_ZOOM_OUT,
|
Cursor::ZoomOut => structs::NS_STYLE_CURSOR_ZOOM_OUT,
|
||||||
}
|
}
|
||||||
} as u8;
|
} as u8;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -727,41 +727,41 @@ impl WindowMethods for Window {
|
||||||
use glutin::MouseCursor;
|
use glutin::MouseCursor;
|
||||||
|
|
||||||
let glutin_cursor = match c {
|
let glutin_cursor = match c {
|
||||||
Cursor::NoCursor => MouseCursor::NoneCursor,
|
Cursor::None => MouseCursor::NoneCursor,
|
||||||
Cursor::DefaultCursor => MouseCursor::Default,
|
Cursor::Default => MouseCursor::Default,
|
||||||
Cursor::PointerCursor => MouseCursor::Hand,
|
Cursor::Pointer => MouseCursor::Hand,
|
||||||
Cursor::ContextMenuCursor => MouseCursor::ContextMenu,
|
Cursor::ContextMenu => MouseCursor::ContextMenu,
|
||||||
Cursor::HelpCursor => MouseCursor::Help,
|
Cursor::Help => MouseCursor::Help,
|
||||||
Cursor::ProgressCursor => MouseCursor::Progress,
|
Cursor::Progress => MouseCursor::Progress,
|
||||||
Cursor::WaitCursor => MouseCursor::Wait,
|
Cursor::Wait => MouseCursor::Wait,
|
||||||
Cursor::CellCursor => MouseCursor::Cell,
|
Cursor::Cell => MouseCursor::Cell,
|
||||||
Cursor::CrosshairCursor => MouseCursor::Crosshair,
|
Cursor::Crosshair => MouseCursor::Crosshair,
|
||||||
Cursor::TextCursor => MouseCursor::Text,
|
Cursor::Text => MouseCursor::Text,
|
||||||
Cursor::VerticalTextCursor => MouseCursor::VerticalText,
|
Cursor::VerticalText => MouseCursor::VerticalText,
|
||||||
Cursor::AliasCursor => MouseCursor::Alias,
|
Cursor::Alias => MouseCursor::Alias,
|
||||||
Cursor::CopyCursor => MouseCursor::Copy,
|
Cursor::Copy => MouseCursor::Copy,
|
||||||
Cursor::MoveCursor => MouseCursor::Move,
|
Cursor::Move => MouseCursor::Move,
|
||||||
Cursor::NoDropCursor => MouseCursor::NoDrop,
|
Cursor::NoDrop => MouseCursor::NoDrop,
|
||||||
Cursor::NotAllowedCursor => MouseCursor::NotAllowed,
|
Cursor::NotAllowed => MouseCursor::NotAllowed,
|
||||||
Cursor::GrabCursor => MouseCursor::Grab,
|
Cursor::Grab => MouseCursor::Grab,
|
||||||
Cursor::GrabbingCursor => MouseCursor::Grabbing,
|
Cursor::Grabbing => MouseCursor::Grabbing,
|
||||||
Cursor::EResizeCursor => MouseCursor::EResize,
|
Cursor::EResize => MouseCursor::EResize,
|
||||||
Cursor::NResizeCursor => MouseCursor::NResize,
|
Cursor::NResize => MouseCursor::NResize,
|
||||||
Cursor::NeResizeCursor => MouseCursor::NeResize,
|
Cursor::NeResize => MouseCursor::NeResize,
|
||||||
Cursor::NwResizeCursor => MouseCursor::NwResize,
|
Cursor::NwResize => MouseCursor::NwResize,
|
||||||
Cursor::SResizeCursor => MouseCursor::SResize,
|
Cursor::SResize => MouseCursor::SResize,
|
||||||
Cursor::SeResizeCursor => MouseCursor::SeResize,
|
Cursor::SeResize => MouseCursor::SeResize,
|
||||||
Cursor::SwResizeCursor => MouseCursor::SwResize,
|
Cursor::SwResize => MouseCursor::SwResize,
|
||||||
Cursor::WResizeCursor => MouseCursor::WResize,
|
Cursor::WResize => MouseCursor::WResize,
|
||||||
Cursor::EwResizeCursor => MouseCursor::EwResize,
|
Cursor::EwResize => MouseCursor::EwResize,
|
||||||
Cursor::NsResizeCursor => MouseCursor::NsResize,
|
Cursor::NsResize => MouseCursor::NsResize,
|
||||||
Cursor::NeswResizeCursor => MouseCursor::NeswResize,
|
Cursor::NeswResize => MouseCursor::NeswResize,
|
||||||
Cursor::NwseResizeCursor => MouseCursor::NwseResize,
|
Cursor::NwseResize => MouseCursor::NwseResize,
|
||||||
Cursor::ColResizeCursor => MouseCursor::ColResize,
|
Cursor::ColResize => MouseCursor::ColResize,
|
||||||
Cursor::RowResizeCursor => MouseCursor::RowResize,
|
Cursor::RowResize => MouseCursor::RowResize,
|
||||||
Cursor::AllScrollCursor => MouseCursor::AllScroll,
|
Cursor::AllScroll => MouseCursor::AllScroll,
|
||||||
Cursor::ZoomInCursor => MouseCursor::ZoomIn,
|
Cursor::ZoomIn => MouseCursor::ZoomIn,
|
||||||
Cursor::ZoomOutCursor => MouseCursor::ZoomOut,
|
Cursor::ZoomOut => MouseCursor::ZoomOut,
|
||||||
};
|
};
|
||||||
self.window.set_cursor(glutin_cursor);
|
self.window.set_cursor(glutin_cursor);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue