Aparajita Fishman
f76404ef5e
Merge branch 'refs/heads/system-font'
2012-07-10 16:41:06 -07:00
Aparajita Fishman
ec4bfa00ee
Per Cocoa, 0 size means create a static font in the current system font size. Added tests.
2012-07-10 16:40:44 -07:00
Aparajita Fishman
4df0b7c940
Merge branch 'archive-formatter'
2012-07-09 21:31:09 -07:00
Aparajita Fishman
73fea44aa2
CPControl now archives/unarchives its formatter
...
This allows you to use a formatter with a table column's data view.
2012-07-09 21:30:09 -07:00
Aparajita Fishman
6cd2c96152
Merge branch 'system-font'
2012-07-09 16:50:55 -07:00
Aparajita Fishman
309463f15d
Fixed parameter name
2012-07-09 16:50:31 -07:00
Aparajita Fishman
37a89a7b0a
Cleanup
2012-07-09 15:47:26 -07:00
Aparajita Fishman
106e21b79c
Merge branch 'system-font'
2012-07-09 15:33:34 -07:00
Aparajita Fishman
6b6f5d98e4
Overhaul of system font handling
...
- System fonts now track the currently configured system font at runtime.
- You can specify CPFontCurrentSystemSize as a system font size to track the currently configured system font size at runtime.
- Theme fonts and nib2cib now determine face and size at runtime, there is no need to recompile if the system font is changed in Info.plist.
- All hard-coded references to 12.0 as a system font size have been replaced by the current system font size.
2012-07-09 15:29:56 -07:00
Antoine Mercadal
2712a4d45c
removed debug console.log
2012-07-09 15:05:03 -07:00
Antoine Mercadal
d93fa98d1e
Merge branch 'master' of https://github.com/cappuccino/cappuccino
2012-07-09 15:04:17 -07:00
Antoine Mercadal
63616cc50a
fix enter key not working to select items in CPComboBox. With the help of @aparajita
2012-07-09 15:03:59 -07:00
Alexander Ljungberg
970dc912cb
Merge branch 'master' into slevenbits
2012-07-09 20:32:07 +01:00
Alexander Ljungberg
eb643a2df8
Simplify code.
2012-07-09 20:31:29 +01:00
Alexander Ljungberg
81f958eee1
Merge pull request #1605 from slevenbits/colorwell-styling
...
`CPColorWell` and `CPColorPanel` updates.
2012-07-09 20:17:49 +01:00
Alexander Ljungberg
613f61a898
Unit test CPColorWell archiving.
2012-07-09 20:03:19 +01:00
Alexander Ljungberg
77a009c9a6
Highlighted and disabled looks for bordered CPColorWell.
2012-07-09 19:53:57 +01:00
Alexander Ljungberg
2d8a849d12
nib2cib size fix for bordered CPColorWell.
2012-07-09 19:19:38 +01:00
Alexander Ljungberg
b09908e6af
Themable CPColorWell with Aristo look when bordered.
2012-07-09 19:18:46 +01:00
Antoine Mercadal
ad74e93ea2
use CPPopUpMenuWindowLevel for _CPPopUpList's window level
2012-07-09 10:20:18 -07:00
Alexander Ljungberg
754311d2e2
More colour panel clean up.
2012-07-09 16:06:09 +01:00
Alexander Ljungberg
f6514f3c64
Fix CPColorPanel errors and code style.
2012-07-09 15:57:24 +01:00
Alexander Ljungberg
f398185aad
CGRectInsetByInset geometry function.
...
This operation appears again and again in Cappuccino.
2012-07-09 15:44:13 +01:00
Alexander Ljungberg
4390bea31f
Simplify CPColorWell drawing and mouse handling.
...
Use standard CPControl mouse handling and highlighting.
Switch to setNeedsLayout based drawing and hook up first themed property.
2012-07-09 13:01:44 +01:00
Alexander Ljungberg
660c98d6e5
Use theme system for CPColorWell bordered state.
...
This is more consistent with the rest of Cappuccino and prepares for theming support.
2012-07-09 12:20:47 +01:00
Alexander Ljungberg
1154a629a7
Code formatting.
2012-07-09 11:11:37 +01:00
Alexander Ljungberg
6f84440bcd
Merge branch 'master' into slevenbits
2012-07-08 21:29:08 +01:00
Alexander Ljungberg
09e235eb60
Refs #1603 . Optimise slightly.
2012-07-08 21:26:47 +01:00
Alexander Ljungberg
9dab0f083d
Merge pull request #1603 from slevenbits/indexset-passingtest
...
Add *passingTest methods to CPIndexSet
2012-07-08 21:26:05 +01:00
Ilya Kulakov
6dd44687c5
Implement *passingTest methods of CPIndexSet.
2012-07-09 02:40:47 +07:00
Alexander Ljungberg
4f69d82a4e
Merge branch 'master' into slevenbits
2012-07-08 14:13:37 +01:00
Alexander Ljungberg
1a639afd99
Typos.
2012-07-08 14:13:21 +01:00
Antoine Mercadal
72cc494df4
fix bug showing the CPComboBox's list under popover
2012-07-06 16:02:40 -07:00
aparajita
98fbf3abc1
Merge pull request #1601 from slevenbits/CPComboBox
...
CPComboBox and CPTextField enhancements
- Full Cocoa-compliant implementation of CPComboBox and CPComboBoxDelegate.
- Better focus ring for CPTextField and all subclasses.
- CPTextField and its subclasses draw disabled contents differently, per Cocoa.
2012-07-06 13:24:01 -07:00
Aparajita Fishman
b85e44098b
Merge branch 'CPComboBox'
2012-07-06 08:51:19 -07:00
Alexander Ljungberg
34e7d4abe5
Merge pull request #1600 from slevenbits/window-controller-container-view
...
Window controller container view
2012-07-06 16:36:26 +01:00
Ilya Kulakov
f434717372
Fix style.
2012-07-06 16:03:29 +01:00
Ilya Kulakov
88f8581dcc
Implement -[CPWindowController setViewControllerContainerView:], fix -[CPWindowController setViewControllerView:]
...
Container view is responsible for laying out its views.
Container view is a content view of the window.
If there is no container view, view controller's view is a content view of the window.
2012-07-06 16:03:29 +01:00
Alexander Ljungberg
552ba68187
Refs #1599 . Fix teacher.car.year unit test message.
2012-07-06 15:53:19 +01:00
Alexander Ljungberg
cff29904d7
Refs #1599 . Format code.
2012-07-06 15:53:03 +01:00
Alexander Ljungberg
b1774cdccf
Merge pull request #1599 from slevenbits/kvo-fix
...
Wrong key path and change send to the observer
2012-07-06 15:38:50 +01:00
Aparajita Fishman
32737e0b72
CPComboBox and CPTextField enhancements
...
- Full Cocoa-compliant implementation of CPComboBox and CPComboBoxDelegate.
- Better focus ring for CPTextField and all subclasses.
- CPTextField and its subclasses draw disabled contents differently, per Cocoa.
2012-07-06 00:15:23 -07:00
aparajita
b54ce4d782
Merge pull request #1597 from slevenbits/cptableview-grid
...
Make the default grid color in IB show correctly in CPTableView.
- Changed the default grid color from #dce0e2 to #ccc.
- Fixed NSColor to recognize the named color "gridColor" and set it to #ccc.
- NSTableView always saves the grid color from IB.
2012-07-05 16:16:30 -07:00
Aparajita Fishman
b6adf26549
Make Alexander happy. ;-)
2012-07-05 12:26:55 -07:00
Aparajita Fishman
d0bfde1887
Annotate indexOfObject methods, use "index" instead of "idx"
2012-07-05 11:34:01 -07:00
Ilya Kulakov
4094a1f826
Fix wrong change is sent to observer when top level object is changed.
...
When you change the top level object, observer MUST receive value
for the key path of the previous top level object as old and
value for the key path of the new top level object as new.
2012-07-05 17:59:29 +07:00
Alexander Ljungberg
8afb67521d
Annotate indexesOfObjectsPassingTest: function signature.
2012-07-04 23:26:07 +01:00
Alexander Ljungberg
34be9cea3a
Refs #1559 . Fix split view autosave test.
2012-07-04 23:17:38 +01:00
Aparajita Fishman
618194996a
Fixed CPString -hasSuffix docs
2012-07-04 17:29:28 -04:00
aparajita
e444a5d60a
Merge pull request #1598 from slevenbits/array-filters-fix
...
Fixed the method names committed in 0f5a6b4e5e
2012-07-04 14:16:14 -07:00