Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Add documentation comments to bevy_window #4333

Closed
wants to merge 23 commits into from
Closed
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f25ddb3
Add documentation comments to `bevy_window`
arnavc52 Mar 25, 2022
1f0b6f7
Cargo fmt for `bevy_window` documentation comments
arnavc52 Mar 25, 2022
c15fd98
Fix explanation for `CursorIcon::Arrow`
arnavc52 Mar 25, 2022
faa5318
Link to `winit` in `bevy_window::CursorIcon`
arnavc52 Mar 25, 2022
6589334
Improve documentation for `bevy_window::WindowDescriptor`
arnavc52 Mar 25, 2022
2d7a807
Change a comment in crates/bevy_window/src/raw_window_handle.rs
arnavc52 Mar 26, 2022
6fe9f48
Add a link in crates/bevy_window/src/lib.rs
arnavc52 Mar 26, 2022
81f178c
Fix a typo in `bevy_window::WindowDescriptor`
arnavc52 Mar 26, 2022
8edd7a4
Clarify `WindowCommand`
arnavc52 Mar 26, 2022
2ac5ab6
Fix `cargo fmt` error
arnavc52 Mar 26, 2022
465107c
Add newlines to crates/bevy_window/src/window.rs
arnavc52 Mar 27, 2022
84f8e6a
Change a doc comment in crates/bevy_window/src/window.rs
arnavc52 Mar 27, 2022
afa3506
Fix yet another typo
arnavc52 Mar 27, 2022
dd6f268
Improve formatting for `bevy_window` doc comments
arnavc52 Jun 15, 2022
da68d78
Merge branch 'main' into main
arnavc52 Jun 15, 2022
0b85374
Reformat `window.rs`
arnavc52 Jun 15, 2022
1bb7b10
More documentation improvements for `window.rs`
arnavc52 Jun 15, 2022
d712fea
Improve formatting for `cursor.rs`
arnavc52 Jun 16, 2022
5290b87
Improve formatting for `event.rs` documentation
arnavc52 Jun 16, 2022
027d94c
Improve formatting for `lib.rs` documentation
arnavc52 Jun 16, 2022
e01ca5c
Improve formatting of `windows.rs` documentation
arnavc52 Jun 16, 2022
6dce308
Improve formatting for `bevy_window` docs
arnavc52 Jun 16, 2022
a441277
Add backticks to `window.rs` docs
arnavc52 Jun 16, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions crates/bevy_window/src/cursor.rs
Original file line number Diff line number Diff line change
@@ -1,39 +1,79 @@
/// The icon to display for a window's cursor
arnavc52 marked this conversation as resolved.
Show resolved Hide resolved
/// Examples of all of these cursors can be found [here](https://www.w3schools.com/cssref/playit.asp?filename=playcss_cursor)
arnavc52 marked this conversation as resolved.
Show resolved Hide resolved
/// This `enum` is simply a copy of a similar `enum` found in [`winit`](https://docs.rs/winit/latest/winit/window/enum.CursorIcon.html).
/// `winit`, in turn, mostly copied cursor types avilable in the browser.
#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
pub enum CursorIcon {
/// The platform-dependent default cursor.
Default,
/// A simple crosshair.
Crosshair,
/// A hand (often used to indicate links in web browsers).
Hand,
/// An arrow. This is the default cursor on most systems.
Arrow,
/// Indicates something is to be moved.
Move,
/// Indicates text that may be selected or edited.
Text,
/// Program busy indicator.
Wait,
/// Help indicator (often rendered as a "?")
Help,
/// Progress indicator. Shows that processing is being done. But in contrast
/// with "Wait" the user may still interact with the program. Often rendered
/// as a spinning beach ball, or an arrow with a watch or hourglass.
Progress,
/// Cursor showing that something cannot be done.
NotAllowed,
/// Indicates that a context menu is available
ContextMenu,
/// Indicates that a cell (or set of cells) may be selected
Cell,
/// Indicates vertical text that may be selected or edited
VerticalText,
/// Indicates that an alias of something is to be created
Alias,
/// Indicates something is to be copied
Copy,
/// Indicates that the dragged item cannot be dropped here
NoDrop,
/// Indicates that something can be grabbed
Grab,
/// Indicates that something is grabbed.
Grabbing,
/// Indicates that the user can scroll by dragging the mouse.
AllScroll,
/// Indicates that the user can zoom in
ZoomIn,
/// Indicates that the user can zoom out
ZoomOut,
/// Indicates that an edge of a box is to be moved right (east)
EResize,
/// Indicates that an edge of a box is to be moved up (north)
NResize,
/// Indicates that an edge of a box is to be moved up and right (north/east)
NeResize,
/// indicates that an edge of a box is to be moved up and left (north/west)
NwResize,
/// Indicates that an edge of a box is to be moved down (south)
SResize,
/// The cursor indicates that an edge of a box is to be moved down and right (south/east)
SeResize,
/// The cursor indicates that an edge of a box is to be moved down and left (south/west)
SwResize,
/// Indicates that an edge of a box is to be moved left (west)
WResize,
/// Indicates a bidirectional resize cursor
EwResize,
/// Indicates a bidirectional resize cursor
NsResize,
/// Indicates a bidirectional resize cursor
NeswResize,
/// Indicates a bidirectional resize cursor
NwseResize,
/// Indicates that a column can be resized horizontally
ColResize,
/// Indicates that the row can be resized vertically
RowResize,
}
6 changes: 3 additions & 3 deletions crates/bevy_window/src/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@ pub struct WindowCreated {
pub struct WindowCloseRequested {
pub id: WindowId,
}

/// An event that is sent whenenver the user's cursor moves.
#[derive(Debug, Clone)]
pub struct CursorMoved {
pub id: WindowId,
pub position: Vec2,
}

/// An event that is sent whenever the user's cursor enters a window.
#[derive(Debug, Clone)]
pub struct CursorEntered {
pub id: WindowId,
}

/// An event that is sent whenever the user's cursor leaves a window.
#[derive(Debug, Clone)]
pub struct CursorLeft {
pub id: WindowId,
Expand Down
2 changes: 2 additions & 0 deletions crates/bevy_window/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#[warn(missing_docs)]
mod cursor;
mod event;
mod raw_window_handle;
Expand All @@ -23,6 +24,7 @@ pub mod prelude {
use bevy_app::prelude::*;
use bevy_ecs::event::Events;

/// A [`Plugin`] that defines an interface for windowing support in Bevy.
pub struct WindowPlugin {
pub add_primary_window: bool,
pub exit_on_close: bool,
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_window/src/raw_window_handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl RawWindowHandleWrapper {
// https://github.com/rust-windowing/raw-window-handle/issues/59
unsafe impl Send for RawWindowHandleWrapper {}
unsafe impl Sync for RawWindowHandleWrapper {}

#[doc(hidden)] // Add docs later; this is an obscure implementation detail
pub struct HasRawWindowHandleWrapper(RawWindowHandle);

// SAFE: the caller has validated that this is a valid context to get RawWindowHandle
Expand Down
1 change: 1 addition & 0 deletions crates/bevy_window/src/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use crate::WindowCloseRequested;
use bevy_app::AppExit;
use bevy_ecs::event::{EventReader, EventWriter};

/// A system that will automatically exit the app when the window is closed
arnavc52 marked this conversation as resolved.
Show resolved Hide resolved
pub fn exit_on_window_close_system(
mut app_exit_events: EventWriter<AppExit>,
mut window_close_requested_events: EventReader<WindowCloseRequested>,
Expand Down
Loading