mirror of
https://github.com/servo/servo.git
synced 2025-08-01 03:30:33 +01:00
Fix servo build and rustfmt recent changes.
We need to introduce another Cursor enum that is specific to embedder_traits and that layout converts to to avoid dependency hell.
This commit is contained in:
parent
05881b5ab4
commit
90c0ec0cf7
19 changed files with 243 additions and 111 deletions
|
@ -7,6 +7,8 @@ extern crate lazy_static;
|
|||
#[macro_use]
|
||||
extern crate log;
|
||||
#[macro_use]
|
||||
extern crate num_derive;
|
||||
#[macro_use]
|
||||
extern crate serde;
|
||||
|
||||
pub mod resources;
|
||||
|
@ -17,9 +19,50 @@ use keyboard_types::KeyboardEvent;
|
|||
use msg::constellation_msg::{InputMethodType, PipelineId, TopLevelBrowsingContextId};
|
||||
use servo_url::ServoUrl;
|
||||
use std::fmt::{Debug, Error, Formatter};
|
||||
use style_traits::cursor::CursorKind;
|
||||
use webrender_api::{DeviceIntPoint, DeviceIntSize};
|
||||
|
||||
/// A cursor for the window. This is different from a CSS cursor (see
|
||||
/// `CursorKind`) in that it has no `Auto` value.
|
||||
#[repr(u8)]
|
||||
#[derive(Copy, Clone, FromPrimitive, PartialEq, Eq, Deserialize, Serialize)]
|
||||
pub enum Cursor {
|
||||
None,
|
||||
Default,
|
||||
Pointer,
|
||||
ContextMenu,
|
||||
Help,
|
||||
Progress,
|
||||
Wait,
|
||||
Cell,
|
||||
Crosshair,
|
||||
Text,
|
||||
VerticalText,
|
||||
Alias,
|
||||
Copy,
|
||||
Move,
|
||||
NoDrop,
|
||||
NotAllowed,
|
||||
Grab,
|
||||
Grabbing,
|
||||
EResize,
|
||||
NResize,
|
||||
NeResize,
|
||||
NwResize,
|
||||
SResize,
|
||||
SeResize,
|
||||
SwResize,
|
||||
WResize,
|
||||
EwResize,
|
||||
NsResize,
|
||||
NeswResize,
|
||||
NwseResize,
|
||||
ColResize,
|
||||
RowResize,
|
||||
AllScroll,
|
||||
ZoomIn,
|
||||
ZoomOut,
|
||||
}
|
||||
|
||||
/// Used to wake up the event loop, provided by the servo port/embedder.
|
||||
pub trait EventLoopWaker: 'static + Send {
|
||||
fn clone(&self) -> Box<EventLoopWaker + Send>;
|
||||
|
@ -90,7 +133,7 @@ pub enum EmbedderMsg {
|
|||
/// Sends an unconsumed key event back to the embedder.
|
||||
Keyboard(KeyboardEvent),
|
||||
/// Changes the cursor.
|
||||
SetCursor(CursorKind),
|
||||
SetCursor(Cursor),
|
||||
/// A favicon was detected
|
||||
NewFavicon(ServoUrl),
|
||||
/// <head> tag finished parsing
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue