Commit graph

448 commits

Author SHA1 Message Date
Brendan Zabarauskas f5fb030c36 Squash some warnings 2015-01-18 20:11:33 +11:00
tomaka 00460364ca Merge pull request #208 from kazimuth/osxcontext
Fix #177 merge conflicts
2015-01-18 09:09:50 +01:00
James Gilles 75c14c5213 Remove AsciiExt import, s/uint/u32/, delete some files I accidentally
committed (whoops)
2015-01-17 21:13:57 -05:00
James Gilles 211a326036 Merge PixelPirate's changes and fix merge conflicts 2015-01-17 20:42:44 -05:00
tomaka 495f6f886d Merge pull request #207 from tomaka/update-rustc
Update for rustc/cargo
2015-01-17 18:07:29 +01:00
Pierre Krieger 7557dc52fc Update for rustc/cargo 2015-01-17 18:02:22 +01:00
tomaka f1ec5db585 Merge pull request #206 from tomaka/non-mutable-set-cursor
Change &mut self to &self in set_cursor
2015-01-17 08:46:25 +01:00
Bryan Bell e7e66b057d Change &mut self to &self in set_cursor 2015-01-17 08:28:52 +01:00
tomaka 2cabfdd373 Merge pull request #204 from tomaka/fix-osx-attempt
More OS/X fixes
2015-01-15 21:01:21 +01:00
Pierre Krieger 3ce5fd08a8 More OS/X fixes 2015-01-15 21:01:09 +01:00
tomaka afba03bf2a Merge pull request #203 from tomaka/osx-fix-attempt
More OS/X fixes
2015-01-15 20:49:44 +01:00
Pierre Krieger c3b2f45ca3 More OS/X fixes 2015-01-15 20:49:03 +01:00
tomaka 1e2248a441 Merge pull request #202 from tomaka/osx-fix-attempt
Blind attempt to fix the OS/X build
2015-01-15 20:26:24 +01:00
Pierre Krieger 7652cc5860 Blind attempt to fix the OS/X build 2015-01-15 20:20:52 +01:00
tomaka 22a27767d5 Merge pull request #200 from ozkriff/master
android: Fixed depth buffer
2015-01-15 09:04:03 +01:00
Andrey Lesnikov 5a589b1783 android: Fixed depth buffer 2015-01-15 10:05:19 +03:00
tomaka e3943945c7 Merge pull request #197 from ozkriff/master
x11, android, win: [ui]size -> [ui]32
2015-01-13 20:59:48 +01:00
Andrey Lesnikov 5a4fee967a x11, android, win32: [ui]size, [u]int -> [ui]32 2015-01-13 16:23:30 +03:00
tomaka 2d4f1c72fb Merge pull request #196 from ozkriff/master
Fixed android: Added 'MouseCursor' import
2015-01-13 12:18:32 +01:00
Andrey Lesnikov d11f63a749 Fixed android: Added 'MouseCursor' import 2015-01-13 13:58:05 +03:00
tomaka 05a03fb6a1 Merge pull request #192 from bjwbell/mouse-cursors
Add mouse cursor support
2015-01-13 10:43:46 +01:00
Bryan Bell 0fba0a9a73 Code review comments
- Revert version back to 0.0.4
- Add comment that set_cursor has no effect on Android
2015-01-13 01:23:34 -08:00
tomaka 88fd84f595 Merge pull request #195 from tomaka/appveyor-badge
Add appveyor build status in README
2015-01-13 09:44:49 +01:00
Pierre Krieger 746af5a835 Add appveyor build status in README 2015-01-13 09:44:14 +01:00
tomaka 0ffa3b80f1 Merge pull request #193 from bjwbell/int-and-uint-to-u-and-isize
Change uint/int to usize/isize
2015-01-13 07:57:10 +01:00
Bryan Bell 5389c73b85 Fix OS X & Win32 builds 2015-01-12 19:45:20 -08:00
Bryan Bell 995bd37c78 Change uint/int to usize/isize
From https://github.com/rust-lang/rfcs/pull/544 the types uint/int were
renamed to usize/isize.
2015-01-12 19:33:31 -08:00
Bryan Bell 95f0990074 Refine X11 cursor selections
For MouseCursor::Cell, NotAllowed, NoDrop, Grab, Grabbing, ... set the
appropriate X11 cursor.

Also alphabetize the cursors listed in the MouseCursor enum.
2015-01-12 19:00:45 -08:00
Bryan Bell b532b8c65f Add mouse cursor support
Add a new api, window.set_cursor, for setting the cursor. The enum MouseCursor lists the possible cursors.

Only X11 is implemented. On OSX, Android, & Win32 the window.set_cursor function
either does nothing or calls the "unimplemented!" macro.
2015-01-12 16:22:37 -08:00
tomaka 318f0d2d06 Merge pull request #191 from sbward/osx-1.0-alpha
OSX compatibility for Rust 1.0 alpha
2015-01-12 21:21:53 +01:00
Sam Ward 2b0a70e69b Revert arch_64 feature flag for rust-cocoa 2015-01-11 16:26:26 -08:00
Sam Ward 879f61dbbc OSX compatibility for Rust 1.0 alpha 2015-01-10 01:56:47 -08:00
Pierre Krieger 5a20f0af6b Bump version number 2015-01-10 08:55:51 +01:00
tomaka f72b09bcb7 Merge pull request #190 from tomaka/update-rustc
Update for rust alpha 1.0
2015-01-10 08:33:27 +01:00
Pierre Krieger 469d0eafd1 Update for rust alpha 1.0 2015-01-10 08:23:20 +01:00
tomaka 9d7dbf7eb0 Merge pull request #189 from ozkriff/master
android: Updated for Rust ea6f65c5f 2015-01-06
2015-01-08 19:02:22 +01:00
Andrey Lesnikov dbe38ff49a android: Updated for Rust ea6f65c5f 2015-01-06 2015-01-08 20:57:04 +03:00
tomaka 181e4a1d8f Merge pull request #187 from tomaka/update-rustc
Update for Rustc
2015-01-08 13:44:26 +01:00
Pierre Krieger 3920cd5e80 Merge remote-tracking branch 'cybergeek94/master' into update-rustc
Conflicts:
	examples/support/mod.rs
	src/lib.rs
	tests/headless.rs
2015-01-08 12:58:58 +01:00
Austin Bonander 8d9133d331 Update to latest Rust nightly 2015-01-08 03:45:46 -08:00
Pierre Krieger dbdb43f077 Update for Rustc 2015-01-08 09:28:22 +01:00
tomaka 25b261975c Merge pull request #186 from tomaka/update-rustc
Update for Rustc
2015-01-05 15:12:28 +01:00
Pierre Krieger 885d5e9c38 Update for Rustc 2015-01-05 14:39:58 +01:00
tomaka bfd21793a8 Merge pull request #184 from mikedilger/upstream_fallout
fix for Iterator now using associated types
2015-01-05 08:37:09 +01:00
Mike Dilger 53482b2a46 fix for Iterator now using associated types 2015-01-05 16:06:16 +13:00
tomaka 2174177fda Merge pull request #183 from ozkriff/master
android: Updated for rust fc2ba1393 2015-01-03
2015-01-04 20:01:57 +01:00
Andrey Lesnikov 2b7e74d55a android: Updated for rust fc2ba1393 2015-01-03 2015-01-04 21:49:30 +03:00
tomaka 0937d809b5 Merge pull request #181 from tomaka/update-rustc
Update for Rustc
2015-01-03 23:23:40 +01:00
Pierre Krieger 4c5e430dd3 Update for Rustc 2015-01-03 23:15:39 +01:00
tomaka ebe32bb2d8 Merge pull request #180 from TyOverby/event-change
Change the way that event iterators are represented.
2015-01-02 09:22:27 +01:00