Commit Graph
68 Commits
Author SHA1 Message Date
Francisco Ryan Tolmasky I e1fefd1018 Fixing merge conflicts.
Merge branch 'master' into merge_branch

Conflicts:
	AppKit/CPView.j
2008-09-10 20:48:10 -07:00
Francisco Ryan Tolmasky I 5618b628cf Modernized CPView drawing.
Fix for http://cappuccino.lighthouseapp.com/projects/16499-cappuccino/tickets/31-make-cpview-use-run-loop-drawing.
Fix for http://cappuccino.lighthouseapp.com/projects/16499/tickets/28-drawrect-is-called-twice.

[#31 state:resolved]
[#28 state:resolved]

Reviewed by Tom.
2008-09-10 20:26:36 -07:00
Ross Boucher 62e44d3d12 Merging conflict
Merge branch 'master' into merge_branch

Conflicts:
	AppKit/Cib/CPCustomView.j
2008-09-10 16:46:32 -07:00
Ross Boucher a40fbd7961 Add the first draft of documentation inline. 2008-09-10 15:11:37 -07:00
Francisco Ryan Tolmasky I 2e361b447d Merge branch 'master' of git@github.com:280north/cappuccino 2008-09-09 14:58:37 -07:00
Francisco Ryan Tolmasky I 4a858cda3e Fix for http://cappuccino.lighthouseapp.com/projects/16499/tickets/30-make-nib2cib-work-with-new-build-system#ticket-30-1.
[#30 state:resolved]

Reviewed by tom.
2008-09-09 14:57:53 -07:00
Tom Robinson ca85476d75 Fixed two incorrect and missing methods in CGContextCanvas
Reviewed by Francisco
2008-09-09 03:31:43 -07:00
Ross Boucher c25005de43 Add a missing line in CPWindow.j.
[#26 state:resolved]
2008-09-08 22:51:00 -07:00
Ross Boucher 1d5b9e6b7d Stop catching all command keys, instead set up a blacklist of keys to stop.
[#19 state:resolved]
2008-09-08 20:09:00 -07:00
Francisco Ryan Tolmasky I d31ddcbe2e Added CPSecureTextField import to AppKit.j.
Reviewed by me.
2008-09-08 19:57:45 -07:00
Francisco Ryan Tolmasky I 80dffdec14 Fix for http://cappuccino.lighthouseapp.com/projects/16499-cappuccino/tickets/27-cpsecuretextfield.
[#27 state:resolved]

Reviewed by me.
2008-09-08 12:56:10 -07:00
Will Larson c5415eae05 In attempt to mimic existing code, inadvertantly mimicked too much. Removing unnecessary lines. 2008-09-07 10:35:17 -04:00
Will Larson b1c99a5f0a Added placeholder and setPlaceholder methods to CPTextField, to facilitate displaying placeholder text for textfields before user has entered text. May want to consider changing text color while displaying placeholder text. 2008-09-07 09:43:28 -04:00
Francisco Ryan Tolmasky I 2c3ac4c1c3 Removed CPHUDSlider class. It is legacy code.
Reviewed by me.
2008-09-07 02:57:39 -07:00
Francisco Ryan Tolmasky I 71a468f932 Fix for http://cappuccino.lighthouseapp.com/projects/16499/tickets/21-resize-icon-displays-incorrectly-with-custom-windows.
Added:

- setResizeIndicatorOffset:
- resizeIndicatorOffset

to CPWindow.

[#21 state:resolved]

Reviewed by me.
2008-09-07 02:49:32 -07:00
Francisco Ryan Tolmasky I e99efff0c6 Fix for http://cappuccino.lighthouseapp.com/projects/16499/tickets/3-typo-in-cpapplication-removeobesrver.
Reviewed by ross.
2008-09-04 22:09:38 -07:00
Francisco Ryan Tolmasky I 3d1b2f9560 Made objj point to Frameworks in lib.
Reviewed by tom.
2008-09-04 04:23:16 -07:00
Francisco Ryan Tolmasky I a97bb72800 Initial commit.
Reviewed by francisco, ross and tom.
2008-09-04 03:52:20 -07:00