Skip to content

Commit 2442305

Browse files
felixrabeOsspial
authored andcommitted
Forward porting (rust-windowing#966)
* README: Use shields.io instead of Herokuapp (rust-windowing#859) * README: Link to FEATURES.md and missing features wiki page (rust-windowing#860) Closes rust-windowing#854 * Update URLs (rust-windowing#863) * CHANGELOG.md: Add line from rust-windowing#861 (legacy) that is missing from equivalent rust-windowing#964 (EL 2)
1 parent 0636483 commit 2442305

6 files changed

+24
-19
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
- [ ] Added an entry to `CHANGELOG.md` if knowledge of this change could be valuable to users
44
- [ ] Updated documentation to reflect any user-facing changes, including notes of platform-specific behavior
55
- [ ] Created an example program if it would help users understand this functionality
6-
- [ ] Updated [feature matrix](https://github.com/tomaka/winit/blob/master/FEATURES.md), if new features were added or implemented
6+
- [ ] Updated [feature matrix](https://github.com/rust-windowing/winit/blob/master/FEATURES.md), if new features were added or implemented

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "deps/apk-builder"]
22
path = deps/apk-builder
3-
url = https://github.com/tomaka/android-rs-glue
3+
url = https://github.com/rust-windowing/android-rs-glue

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Unreleased
22

33
- Change `Event::Suspended(true / false)` to `Event::Suspended` and `Event::Resumed`.
4+
- On X11, fix sanity check which checks that a monitor's reported width and height (in millimeters) are non-zero when calculating the DPI factor.
45

56
# 0.20.0 Alpha 1
67

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ edition = "2018"
77
keywords = ["windowing"]
88
license = "Apache-2.0"
99
readme = "README.md"
10-
repository = "https://github.com/tomaka/winit"
10+
repository = "https://github.com/rust-windowing/winit"
1111
documentation = "https://docs.rs/winit"
1212
categories = ["gui"]
1313

FEATURES.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -194,18 +194,18 @@ Changes in the API that have been agreed upon but aren't implemented across all
194194
|Feature |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS |Emscripten|
195195
|------------------------------ | ----- | ---- | ------- | ----------- | ----- | ----- | -------- |
196196

197-
[#165]: https://github.com/tomaka/winit/issues/165
198-
[#219]: https://github.com/tomaka/winit/issues/219
199-
[#242]: https://github.com/tomaka/winit/issues/242
200-
[#306]: https://github.com/tomaka/winit/issues/306
201-
[#315]: https://github.com/tomaka/winit/issues/315
202-
[#319]: https://github.com/tomaka/winit/issues/319
203-
[#33]: https://github.com/tomaka/winit/issues/33
204-
[#459]: https://github.com/tomaka/winit/issues/459
205-
[#5]: https://github.com/tomaka/winit/issues/5
206-
[#63]: https://github.com/tomaka/winit/issues/63
207-
[#720]: https://github.com/tomaka/winit/issues/720
208-
[#721]: https://github.com/tomaka/winit/issues/721
209-
[#750]: https://github.com/tomaka/winit/issues/750
210-
[#804]: https://github.com/tomaka/winit/issues/804
211-
[#812]: https://github.com/tomaka/winit/issues/812
197+
[#165]: https://github.com/rust-windowing/winit/issues/165
198+
[#219]: https://github.com/rust-windowing/winit/issues/219
199+
[#242]: https://github.com/rust-windowing/winit/issues/242
200+
[#306]: https://github.com/rust-windowing/winit/issues/306
201+
[#315]: https://github.com/rust-windowing/winit/issues/315
202+
[#319]: https://github.com/rust-windowing/winit/issues/319
203+
[#33]: https://github.com/rust-windowing/winit/issues/33
204+
[#459]: https://github.com/rust-windowing/winit/issues/459
205+
[#5]: https://github.com/rust-windowing/winit/issues/5
206+
[#63]: https://github.com/rust-windowing/winit/issues/63
207+
[#720]: https://github.com/rust-windowing/winit/issues/720
208+
[#721]: https://github.com/rust-windowing/winit/issues/721
209+
[#750]: https://github.com/rust-windowing/winit/issues/750
210+
[#804]: https://github.com/rust-windowing/winit/issues/804
211+
[#812]: https://github.com/rust-windowing/winit/issues/812

README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# winit - Cross-platform window creation and management in Rust
22

3-
[![](http://meritbadge.herokuapp.com/winit)](https://crates.io/crates/winit)
3+
[![Crates.io](https://img.shields.io/crates/v/winit.svg)](https://crates.io/crates/winit)
44
[![Docs.rs](https://docs.rs/winit/badge.svg)](https://docs.rs/winit)
55
[![Build Status](https://travis-ci.org/rust-windowing/winit.svg?branch=master)](https://travis-ci.org/rust-windowing/winit)
66
[![Build status](https://ci.appveyor.com/api/projects/status/hr89but4x1n3dphq/branch/master?svg=true)](https://ci.appveyor.com/project/Osspial/winit/branch/master)
@@ -12,6 +12,10 @@ winit = "0.20.0-alpha1"
1212

1313
## [Documentation](https://docs.rs/winit)
1414

15+
For features _within_ the scope of winit, see [FEATURES.md](FEATURES.md).
16+
17+
For features _outside_ the scope of winit, see [Missing features provided by other crates](https://github.com/rust-windowing/winit/wiki/Missing-features-provided-by-other-crates) in the wiki.
18+
1519
## Contact Us
1620

1721
Join us in any of these:

0 commit comments

Comments
 (0)