From 80fbbab1982baa4ccd2729fd537274b22fa9b2e0 Mon Sep 17 00:00:00 2001 From: Martin Lindhe Date: Tue, 26 Dec 2017 19:39:10 +0100 Subject: [PATCH] avoid dependency of gfx --- Cargo.toml | 2 +- examples/cursor.rs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 26c31d9e..28920589 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,7 +67,7 @@ name = "audio-wav" name = "audio-whitenoise" [[example]] -required-features = ["image", "gfx"] +required-features = ["image"] name = "cursor" [[example]] diff --git a/examples/cursor.rs b/examples/cursor.rs index 60656038..a3e3a80a 100644 --- a/examples/cursor.rs +++ b/examples/cursor.rs @@ -7,7 +7,7 @@ use sdl2::image::{LoadSurface, INIT_PNG, INIT_JPG}; use sdl2::keyboard::Keycode; use sdl2::mouse::Cursor; use sdl2::pixels::Color; -use sdl2::gfx::primitives::DrawRenderer; +use sdl2::rect::Rect; use sdl2::surface::Surface; pub fn run(png: &Path) { @@ -35,6 +35,8 @@ pub fn run(png: &Path) { canvas.clear(); canvas.present(); + canvas.set_draw_color(Color::RGBA(255, 255, 255, 255)); + let mut events = sdl_context.event_pump().unwrap(); 'mainloop: loop { @@ -44,8 +46,7 @@ pub fn run(png: &Path) { Event::KeyDown {keycode: Option::Some(Keycode::Escape), ..} => break 'mainloop, Event::MouseButtonDown {x, y, ..} => { - let color = Color::RGB(255, 255, 255); - canvas.pixel(x as i16, y as i16, color).unwrap(); + canvas.fill_rect(Rect::new(x, y, 1, 1)).unwrap(); canvas.present(); } _ => {}