Aparajita Fishman
d2407d1c2a
Don't generate XML for docs, updated ThemeDescriptor capp template
2011-05-11 12:18:21 -04:00
Aparajita Fishman
17dc96ad2f
Merge remote branch 'refs/remotes/280north/master'
2011-05-11 08:13:33 -04:00
Francisco Ryan Tolmasky I
019acb76a3
Very minor style change.
...
Reviewed by me.
2011-05-10 21:34:34 -07:00
Francisco Ryan Tolmasky I
4509df3c2a
Merge pull request #1259 from masonmark/fix-test-for-leopard-sdk
...
Fix build-time test for presence of Mac OS X 10.5 SDK
2011-05-10 21:33:25 -07:00
Mason Mark
7059dd63b7
Use code style similar to other code in file
2011-05-11 13:26:18 +09:00
Mason Mark
402c82801b
Extra newline typo
2011-05-11 13:23:09 +09:00
Mason Mark
b84d721887
Fix build-time test for presence of Mac OS X 10.5 SDK
...
Some jake build tasks test whether the 10.5 SDK is present, and if so, they build using it. However, the path to the SDK is not necessarily consistent across installations, so testing for path existence is not the best way to check whether the SDK is present. Doing it that way caused build failures on machines with both Xcode 3 and Xcode 4 installed. In this fix, we now ask xcodebuild what SDKs are present, and only fall back on the path existence test if the local copy of xcodebuild does not support listing SDKs (as is the case for old versions of xcodebuild).
2011-05-11 13:15:12 +09:00
Randy Luecke
48ccbb8883
Merge pull request #1258 from aparajita/performKeyEquivalent-docs
...
Correct -performKeyEquivalent docs.
2011-05-10 16:23:38 -07:00
Aparajita Fishman
23a5b83ea6
Corrected and added -performKeyEquivalent docs.
2011-05-10 19:20:37 -04:00
Aparajita Fishman
b3a427ba18
Correct performKeyEquivalent documentation
2011-05-10 19:17:32 -04:00
Aparajita Fishman
4cdefcc2c7
Merge remote branch 'refs/remotes/280north/master'
2011-05-10 11:12:05 -04:00
Alexander Ljungberg
5a2e5a7de3
Fixed CPColor isEqual: for pattern images.
2011-05-09 21:38:32 -04:00
Aparajita Fishman
b7c0dcf050
Added textFrame method to locate the text within the view
2011-05-09 21:14:02 -04:00
Alexander Ljungberg
3db05c94ab
Closes #682 . Fix CPColor isEqual:.
2011-05-09 20:59:38 -04:00
Alexander Ljungberg
1ba69aee91
Refs #1254 . Updated unit test to account for, and verify that CPSet addObject:nil/undefined throws an exception.
2011-05-09 20:03:09 -04:00
Aparajita Fishman
fe9573e5b8
Merge branch 'refs/heads/object-union-operators'
2011-05-09 17:12:54 -04:00
Aparajita Fishman
9fcf0258e0
Fix the content inset on CPTextField so there are 2 pixels below and 3 pixels above a text selection.
2011-05-09 17:12:27 -04:00
Aparajita Fishman
ea958160dc
Although it is not directly documented, CPMutableSet -addObject should raise with nil or undefined.
2011-05-09 15:49:44 -04:00
Aparajita Fishman
e22faa0d79
Added distinctUnionOfObjects and unionOfObjects object operators.
2011-05-09 15:31:12 -04:00
Alexander Ljungberg
3d614b38c1
Merge branch '0.9.1'
2011-05-09 14:54:54 -04:00
Alexander Ljungberg
d51921d4f3
Closes #664 . Fixed: web view sizing bug when loading contents prior to adding the view to the display tree.
2011-05-09 14:54:30 -04:00
Alexander Ljungberg
eb8d9775aa
[CPView _isVisible] convenience method.
2011-05-09 14:54:24 -04:00
Alexander Ljungberg
d5a0469333
Closes #664 . Fixed: web view sizing bug when loading contents prior to adding the view to the display tree.
2011-05-09 14:38:17 -04:00
Alexander Ljungberg
d5f281320f
[CPView _isVisible] convenience method.
2011-05-09 14:37:54 -04:00
Alexander Ljungberg
1e49072763
Merge branch '0.9.1'
2011-05-09 01:37:29 -04:00
Alexander Ljungberg
d6c7fecf64
Closes #684 . Cleaned up, added attribution and instructions for the CPWebView2 manual test.
2011-05-09 01:36:23 -04:00
Alexander Ljungberg
1392714896
Manual test which tests the effectiveness of both of the previous fixes.
...
The test also includes a URL based web view to show it works before and after the fixes.
2011-05-09 01:24:33 -04:00
Alexander Ljungberg
2563cb5dc1
Refs #684 . Handle content reflows and associated scroll updates when unhiding a CPWebViewScrollAppKit webview.
2011-05-09 01:13:57 -04:00
Alexander Ljungberg
c42295f0c7
Refs #684 . Fixed: sizing problem when revealing hidden CPWebView.
2011-05-09 00:59:45 -04:00
Alexander Ljungberg
cc9bcabf38
Remove apparently unused CPWebView ivar _scrollSize and code.
...
_scrollSize was never set anywhere in Cappuccino, yet it only had an effect if set.
2011-05-09 00:46:25 -04:00
Alexander Ljungberg
6d98583fa6
Merge branch '0.9.1'
2011-05-09 00:34:22 -04:00
Alexander Ljungberg
6f869cebc1
Closes #688 . Unit test verifying that the CPColor hexString weakness described in issue 688 has been resolved.
2011-05-09 00:29:43 -04:00
Aparajita Fishman
175b204bb6
Improvements to the ThemeDescriptor capp template:
...
- New/improved jake tasks: debug, release, all, clean, clobber, test, test-release, help.
- help task shows comprehensive, formatted documentation for the available tasks.
- BlendKit is automatically symlinked into the Frameworks directory if necessary as part of the build process, so that the showcase will always work.
- User can easily change the build directory by changing one line.
- Fixed incorrect placeholders in main.j.
2011-05-07 13:10:33 -04:00
Aparajita Fishman
b126b2946d
Revert "Using objects to encapsulate a bit more"
...
This reverts commit f0a2a91837 .
5c10615c9f fixes the root cause,
thus obviating the reverted commit.
2011-05-06 18:04:36 -04:00
Aparajita Fishman
fec200c835
Merge remote branch 'refs/remotes/280north/master'
2011-05-06 17:56:00 -04:00
Francisco Ryan Tolmasky I
5c10615c9f
Fix for could not load theme errors in nib2cib. CFBundle was using Image to determine if the platform in question supported image spriting. On Rhino, the Image object doesn't exist, throwing an exception and causing everything to break from that point forward.
...
Reviewed by me.
2011-05-06 12:40:09 -07:00
Aparajita Fishman
ea0a47a845
_CPThemeAttribute -setValue should not blow away existing values.
2011-05-06 08:51:17 -04:00
Aparajita Fishman
835d89774a
Merge remote branch 'refs/remotes/origin/nib2cib-fix-load-theme'
2011-05-05 15:00:01 -04:00
Aparajita Fishman
f0a2a91837
Using objects to encapsulate a bit more
2011-05-05 14:40:19 -04:00
Aparajita Fishman
8614bab724
Merge branch 'master' of git://github.com/280north/cappuccino
2011-05-05 08:07:16 -04:00
Aparajita Fishman
9c181cc9c9
Allow class to be used with +themeForView, fix to image load notification
2011-05-05 08:06:31 -04:00
Klaas Pieter Annema
1a842b2a6f
add manual test case for previous commit
2011-05-05 13:21:50 +02:00
Klaas Pieter Annema
9842640474
add more CPMenuItem keyEquivalent mappings
2011-05-05 13:15:38 +02:00
Ross Boucher
1b1bd4f972
Merge pull request #1249 from aparajita/shared-image-fix.
...
Ensure multiple _CPImageAndTextViews sharing the same image are notified
2011-05-04 11:10:58 -07:00
Klaas Pieter Annema
d8a09722c6
Merge branch '0.9.1'
2011-05-04 19:08:42 +02:00
Klaas Pieter Annema
21a50b990f
fix 2 bugs in CPIndexPath
...
1. we didn't return a copy of the indexes
2. indexPathByRemovingLastIndex didn't remove the last index
2011-05-04 19:07:06 +02:00
Aparajita Fishman
739c844b10
Make sure multiple _CPImageAndTextViews sharing the same image are all notified when it is loaded.
2011-05-04 12:16:43 -04:00
Aparajita Fishman
a0a7b126ab
When multiple _CPImageAndTextViews to share a common image, update them all when the image loads.
2011-05-04 10:59:23 -04:00
Randall Luecke
cd05d30f86
Fix for setting a new platform window on a visisble window throwing a DOM exception.
2011-05-01 21:01:13 -04:00
Aparajita Fishman
78ddc2db70
Automated support for multiple themes and simple theme inheritance
2011-04-29 16:45:00 -04:00