aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Move osx delegate stuff into separate typeBrendan Zabarauskas2015-01-201-58/+108
| |
| * if letifyBrendan Zabarauskas2015-01-191-8/+5
| |
* | Merge pull request #213 from tomaka/permanent-iteratorstomaka2015-01-194-11/+33
|\ \ | |/ |/| Iterators returned by wait_events and poll_events are now persistent
| * Iterators returned by wait_events and poll_events are now persistentPierre Krieger2015-01-194-11/+33
| |
* | Merge pull request #211 from glennw/upstream-fixestomaka2015-01-196-3/+49
|\ \ | |/ |/| Upstream of various fixes and features (details below)
| * Fix android APIGlenn Watson2015-01-191-1/+1
| |
| * Add missing get_api stubs.Glenn Watson2015-01-196-3/+49
|/ | | | | | | Add hidpi_factor() support for retina displays. Fix Resize and MouseMoved events to handle retina displays. Fix inverted y position for MouseMoved events on mac. Fix initial painting on retina display.
* Merge pull request #210 from tomaka/fix-winapitomaka2015-01-181-2/+2
|\ | | | | Fix for changes in winapi
| * Fix for changes in winapiPierre Krieger2015-01-181-2/+2
|/
* Merge pull request #209 from bjz/osx-windowtomaka2015-01-182-35/+29
|\ | | | | Remove unnecessary inner method in OSX window constructor
| * Clean up pattern matchesBrendan Zabarauskas2015-01-181-16/+14
| |
| * Remove unnecessary inner methodBrendan Zabarauskas2015-01-181-16/+12
| |
| * Squash some warningsBrendan Zabarauskas2015-01-181-3/+3
|/
* Merge pull request #208 from kazimuth/osxcontexttomaka2015-01-181-4/+10
|\ | | | | Fix #177 merge conflicts
| * Remove AsciiExt import, s/uint/u32/, delete some files I accidentallyJames Gilles2015-01-176-2223/+5
| | | | | | | | committed (whoops)
| * Merge PixelPirate's changes and fix merge conflictsJames Gilles2015-01-176-4/+2228
|/|
| * Removed NSOpenGLPFAOpenGLProfiles enum in favor of the one defined in the ↵Patrick Horlebein2014-12-301-15/+4
| | | | | | | | AppKit bindings
| * Fixed missing std::ascii::AsciiExt importPatrick Horlebein2014-12-301-0/+1
| |
| * Minor match clause cleanupPatrick Horlebein2014-12-291-3/+1
| |
| * Fixed deprecation warningsPatrick Horlebein2014-12-291-2/+2
| |
| * Started adding support for selection OpenGL versions on OS X. Needs issue ↵Patrick Horlebein2014-12-291-4/+23
| | | | | | | | #176 to be fixed.
* | Merge pull request #207 from tomaka/update-rustctomaka2015-01-171-0/+1
|\ \ | | | | | | Update for rustc/cargo
| * | Update for rustc/cargoPierre Krieger2015-01-171-0/+1
| | |
* | | Merge pull request #206 from tomaka/non-mutable-set-cursortomaka2015-01-171-1/+1
|\ \ \ | |/ / |/| | Change &mut self to &self in set_cursor
| * | Change &mut self to &self in set_cursorBryan Bell2015-01-171-1/+1
|/ /
* | Merge pull request #204 from tomaka/fix-osx-attempttomaka2015-01-151-4/+4
|\ \ | | | | | | More OS/X fixes
| * | More OS/X fixesPierre Krieger2015-01-151-4/+4
|/ /
* | Merge pull request #203 from tomaka/osx-fix-attempttomaka2015-01-151-2/+2
|\ \ | | | | | | More OS/X fixes
| * | More OS/X fixesPierre Krieger2015-01-151-2/+2
|/ /
* | Merge pull request #202 from tomaka/osx-fix-attempttomaka2015-01-153-25/+25
|\ \ | | | | | | Blind attempt to fix the OS/X build
| * | Blind attempt to fix the OS/X buildPierre Krieger2015-01-153-25/+25
|/ /
* | Merge pull request #200 from ozkriff/mastertomaka2015-01-151-0/+1
|\ \ | | | | | | android: Fixed depth buffer
| * | android: Fixed depth bufferAndrey Lesnikov2015-01-151-0/+1
|/ /
* | Merge pull request #197 from ozkriff/mastertomaka2015-01-1310-90/+91
|\ \ | | | | | | x11, android, win: [ui]size -> [ui]32
| * | x11, android, win32: [ui]size, [u]int -> [ui]32Andrey Lesnikov2015-01-1310-90/+91
| | |
* | | Merge pull request #196 from ozkriff/mastertomaka2015-01-131-1/+1
|\| | | | | | | | Fixed android: Added 'MouseCursor' import
| * | Fixed android: Added 'MouseCursor' importAndrey Lesnikov2015-01-131-1/+1
|/ /
* | Merge pull request #192 from bjwbell/mouse-cursorstomaka2015-01-138-4/+179
|\ \ | | | | | | Add mouse cursor support
| * | Code review commentsBryan Bell2015-01-132-1/+2
| | | | | | | | | | | | | | | - Revert version back to 0.0.4 - Add comment that set_cursor has no effect on Android
| * | Fix OS X & Win32 buildsBryan Bell2015-01-122-2/+2
| | |
| * | Refine X11 cursor selectionsBryan Bell2015-01-121-19/+22
| | | | | | | | | | | | | | | | | | | | | For MouseCursor::Cell, NotAllowed, NoDrop, Grab, Grabbing, ... set the appropriate X11 cursor. Also alphabetize the cursors listed in the MouseCursor enum.
| * | Add mouse cursor supportBryan Bell2015-01-129-3/+174
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #195 from tomaka/appveyor-badgetomaka2015-01-131-0/+1
|\ \ \ | | | | | | | | Add appveyor build status in README
| * | | Add appveyor build status in READMEPierre Krieger2015-01-131-0/+1
|/ / /
* | | Merge pull request #193 from bjwbell/int-and-uint-to-u-and-isizetomaka2015-01-134-35/+35
|\ \ \ | |/ / |/| | Change uint/int to usize/isize
| * | Change uint/int to usize/isizeBryan Bell2015-01-124-35/+35
|/ / | | | | | | | | From https://github.com/rust-lang/rfcs/pull/544 the types uint/int were renamed to usize/isize.
* | Merge pull request #191 from sbward/osx-1.0-alphatomaka2015-01-123-16/+26
|\ \ | | | | | | OSX compatibility for Rust 1.0 alpha
| * | Revert arch_64 feature flag for rust-cocoaSam Ward2015-01-111-1/+0
| | |
| * | OSX compatibility for Rust 1.0 alphaSam Ward2015-01-103-16/+27
| | |
* | | Bump version numberPierre Krieger2015-01-101-2/+2
|/ /