me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into web

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-09-21 13:51:03 +02:00
commit 0a93be78b8
4 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/integration.yml vendored
View file

@ -1,5 +1,5 @@
name: Integration name: Integration
on: [push] on: [push, pull_request]
jobs: jobs:
test: test:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}

1
.travis.yml
View file

@ -7,7 +7,6 @@ matrix:
allow_failures: allow_failures:
- rust: nightly - rust: nightly
fast_finish: true fast_finish: true
cache: cargo
before_install: before_install:
- | - |
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then

1
examples/tour/Cargo.toml
View file

@ -23,6 +23,7 @@ iced_native = { version = "0.1.0-alpha", path = "../../native" }
# A personal `ggez` fork that introduces a `FontCache` type to measure text # A personal `ggez` fork that introduces a `FontCache` type to measure text
# efficiently and fixes HiDPI issues. # efficiently and fixes HiDPI issues.
ggez = { version = "0.5", git = "https://github.com/hecrj/ggez.git" } ggez = { version = "0.5", git = "https://github.com/hecrj/ggez.git" }
env_logger = "0.6"
[target.'cfg(target_arch = "wasm32")'.dependencies] [target.'cfg(target_arch = "wasm32")'.dependencies]
iced_web = { path = "../../web" } iced_web = { path = "../../web" }

2
examples/tour/src/main.rs
View file

@ -7,6 +7,8 @@ use ggez::graphics;
use ggez::input::mouse; use ggez::input::mouse;
pub fn main() -> ggez::GameResult { pub fn main() -> ggez::GameResult {
env_logger::init();
let (context, event_loop) = { let (context, event_loop) = {
&mut ggez::ContextBuilder::new("iced", "ggez") &mut ggez::ContextBuilder::new("iced", "ggez")
.window_mode(ggez::conf::WindowMode { .window_mode(ggez::conf::WindowMode {