Aparajita Fishman
32dc0826cb
Text size and theming enhancements
...
- _CPImageAndTextView adds extra pixels to allow for fractional pixels in -sizeToFit.
- NSButton now allows buttons that are not fixed height, if the theme allows it.
- Documented the mapping between bezel style constants and their IB style names.
2012-07-13 21:00:02 -07:00
Alexander Ljungberg
eb643a2df8
Simplify code.
2012-07-09 20:31:29 +01:00
Aparajita Fishman
2f1e9d76ec
Non-bordered buttons should retain their size, not shrink to fit.
2012-07-02 09:40:00 -04:00
Ilya Kulakov
913308d886
Refs #1572 . Fix highlighted status is not preserved.
...
When higlightsBy == CPNoCellMask and showsStateBy == CPChangeBackgroundCellMask
higlighted status must be preserved when a user switch state from Off to On.
2012-06-26 03:54:59 +07:00
Alexander Ljungberg
21bb383193
Refs #1527 . Fix button performClick: highlight.
...
Critically this is what enables button highlighting on key equivalents.
2012-06-25 18:13:16 +01:00
Alexander Ljungberg
bd83885eca
Refs #1527 . Backwards compatibility.
...
If no highlight or state masks were encoded (button was encoded prior to them being added), make sure to let the default settings stand.
2012-06-25 17:42:31 +01:00
Alexander Ljungberg
d34d139658
Refs #1572 . Default CPButton type.
...
If a button is created in code it should act like a regular momentary push in button by default.
2012-06-25 17:21:56 +01:00
Alexander Ljungberg
f5c201c0be
Refs #1572 . Fixed: CPPushInCellMask in showsStateBy.
...
Code didn't match comment.
2012-06-25 17:18:07 +01:00
Alexander Ljungberg
10fcc0c452
Refs #1572 . Minor fixes.
2012-06-25 16:26:44 +01:00
Ilya Kulakov
7cf3ac3b40
CPButton and subclasses respect highlightsBy and showsStateBy now.
2012-06-25 18:57:10 +07:00
Ilya Kulakov
66f5e1fb64
Take into account highlightsBy and showsStateBy when decoding cib.
...
nib2cib was modified to take into account these variables
during conversion nib->cib.
2012-06-25 18:57:01 +07:00
Ilya Kulakov
c80417c433
Add highlightsBy method that returns current higlightsBy mask.
2012-06-25 18:56:56 +07:00
Antoine Mercadal
ecdb064a5b
Makes CPButton to dim image when disabled by default
2012-06-13 15:21:45 -07:00
Aparajita Fishman
36bfc7c675
Fixed decode methods to return the correct defaults, removed unnecessary containsValueForKey and || with defaults
2012-04-24 10:15:19 +02:00
Aparajita Fishman
aeb2671fc0
CPImageView enhancements
...
- Changed from deprecated image scaling constants to new ones.
- Added support for CPImageScaleProportionallyUpOrDown (thanks BlairDuncan).
- Cleaned up image layout code.
2012-04-12 14:55:46 -04:00
Aparajita Fishman
37d92c1182
Revert "Merge pull request #1438 from aradabaugh/master", it broke a few things
...
This reverts commit e081dbf127 , reversing
changes made to 71e8f0201a .
2012-02-16 08:21:31 -08:00
aradabaugh
e058efb622
Correcting minor whitespace styling.
2012-01-25 11:40:15 -07:00
aradabaugh
c14643849f
Minor style change.
2012-01-24 22:51:32 -07:00
aradabaugh
edd09ef06a
Enables additional buttonTypes for CPButton
2012-01-24 22:50:01 -07:00
Klaas Pieter Annema
815e64356d
implement _minimumFrameSize in CPButton
2011-05-24 12:29:23 +02:00
Alexander Ljungberg
a51a051cee
Fixed: if a button was unarchived it would have no continuous push delay and a 0 interval.
2011-05-11 19:15:44 -04:00
Mike Fellows
a801860f90
Move the functionality from CPStepper's _CPContinuousButton object into CPButton so any CPButton can be made continuous
2011-01-19 12:02:43 -08:00
Klaas Pieter Annema
8faa17ad33
reset allow mixed state when bound
2011-01-07 15:20:12 +01:00
Klaas Pieter Annema
c2bab5b369
fix [CPButton setObjectValue:CPOnState]
2011-01-07 14:14:19 +01:00
Francisco Ryan Tolmasky I
ffea2de826
Style fixes.
...
Reviewed by me.
2010-12-09 13:00:52 -08:00
Ross Boucher
b80c48886a
Merge branch 'cpbutton-rounded-bezel-style-support' of https://github.com/primalmotion/cappuccino into primalmotion-cpbutton-rounded-bezel-style-support
...
Conflicts:
AppKit/Themes/Aristo/ThemeDescriptors.j
2010-12-08 13:23:14 -08:00
Daniel Brajkovic
6093530175
Added some documentation to CPButton.j
2010-11-18 13:18:01 -06:00
Antoine Mercadal
3c18282510
add support for theme state rounded
2010-11-18 12:07:44 +01:00
Aparajita Fishman
5cd00d71c7
Fixed sizeToFit drawing when there is no image, setNeedsDisplay is no longer needed after sizeToFit.
2010-11-06 17:12:09 -04:00
Francisco Ryan Tolmasky I
52f7844aee
Made it so .h files are automatically included in AppKit (avoiding needing to manually include Platform.h, etc.).
...
Also changed a bunch of <AppKit/*> imports to "*" imports.
Reviewed by me.
2010-11-01 11:10:01 -07:00
Klaas Pieter Annema
6e9f82212b
rename CPView +themeClass to +defaultThemeClass
2010-10-25 14:15:22 +02:00
Aparajita Fishman
c3b5dc747a
CPButton bezelRectForBounds and contentRectForBounds were modifying the bounds parameter in place without copying it.
2010-09-30 17:27:06 -04:00
Klaas Pieter Annema
57813ea3fb
change CPButton imageOffset theme property to image-offset
2010-09-15 12:34:16 +02:00
Aparajita Fishman and Klaas Pieter Annema
ce2c662872
Fixes to previous CPButton image positioning commit.
...
- Checkbox and radio selected states would not show in the images. It turns out that the image and alternate image cannot be encoded->decoded->set without messing up the theme, and unfortunately the theme blending task (during a jake build) would do so. So for now this means that we cannot encode non-theme images with a button class, which is unlikely to happen.
- Since we cannot access themes in the NS classes, I went ahead and started to make some constants in a few control classes so that the values can be changed in one place and affect the theme and nib2cib.
2010-09-10 09:56:26 +02:00
Aparajita Fishman and Klaas Pieter Annema
6680a1f2a7
Overhaul of CPButton and supporting classes to support image positioning the way Cocoa does
2010-09-08 22:13:39 +02:00
Klaas Pieter Annema
c9752195ac
several CPButton theming additions
...
- made image and alternate image a theme property
- made image margins theme-able
2010-08-25 13:26:44 +02:00
Aparajita Fishman and Alexander Ljungberg
05edec8a8b
Removed CPButton -setDefaultButton, new version of CPButton after merging with latest master.
2010-08-22 18:53:52 -04:00
Randall Luecke
6e796d7a22
Fix for endless loop with default buttons.
2010-08-16 15:05:46 -05:00
Randall Luecke
90a45dca29
some fixes to default buttons to make them more cocoa compliant...
2010-08-01 20:19:26 -05:00
Alexander Ljungberg and Ross Boucher
4d1baac4db
Fixed: first clearing a \r keqyEquivalent from one button and then setting it on another would result in an exception.
2010-07-21 14:57:52 -07:00
Klaas Pieter Annema
f40fc321fe
Make the window perform it's defaults button's key equivalent after the default keyDown messages are handled
2010-06-16 14:17:58 +02:00
Alexander Ljungberg and Ross Boucher
44555ac724
UTF compatible CFData base64 string encoder and decoder. Use it for CPButton key equivalent archiving. Also ordered CPText.j constants by value and removed the empty CPText class definition as it caused errors with nib2cib. Fixed: the key equivalent for forward delete (CPDeleteFunctionKey, \uF728) was transformed to '(' (\u0028) when archived and unarchived.
2010-06-11 09:39:19 -07:00
Ross Boucher
421ae6b316
Make CPButton archive its key equivalents, and make nib2cib support the feature.
2010-06-10 10:41:15 -07:00
Alexander Ljungberg
c26ebe0bd2
Added support for menu key equivalents such as Escape or Cmd-Delete. Refactored code to recognize key equivalents for reuse between CPMenu and CPButton. Added unit tests for CPMenu key equivalents.
2010-06-07 19:09:15 -04:00
Alexander Ljungberg
381a44148e
Special keys such as backspace and escape can now be used as key equivalents through checking for their unicode representations in [CPEvent characters]. This replaces the earlier raw key code approach.
2010-06-07 19:09:10 -04:00
Alexander Ljungberg
44f5086600
Key equivalents for CPButton.
2010-06-07 19:08:44 -04:00
Alexander Ljungberg and Ross Boucher
3c5dab1f34
Implemented CPCoding for CPButton imageDimsWhenDisabled. Fixed a problem where setImageDimsWhenDisabled:NO would not cause a redraw even if the image was previously dimmed.
2010-05-24 11:17:25 -07:00
Klaas Pieter Annema and Ross Boucher
ee2f361425
Reimplemented setImageDimsWhenDisabled: on CPButton to only dim the image instead of the entire button
2010-05-12 16:51:28 -07:00
Scott Kyle and Ross Boucher
b0d355a71c
Some somewhat minor style fixes
2010-03-24 19:46:38 -07:00
Ross Boucher
e759c5343b
Add a missing import in CPButton, and a test to ensure you can create one on the command line.
2010-02-22 11:07:11 -08:00