colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-11-13 02:08:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2258 from t00f/fix_controlSize_height

Browse Source 
Fixed: Enable CPTextField to have a specific height
This commit is contained in:
Antoine Mercadal committed 2014-11-17 12:40:37 -08:00
2 parents e40612a032 a5283a26ab
commit afe326c1c1
3 files changed
+14 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPControl.j
+11 -1
View File
@@ -260,10 +260,20 @@ var CPControlBlackColor = [CPColor blackColor];
maxSize = [self currentValueForThemeAttribute:@"max-size"];
if (minSize.width > 0)
{
frameSize.width = MAX(minSize.width, frameSize.width);
if (maxSize.width > 0)
frameSize.width = MIN(maxSize.width, frameSize.width);
}
if (minSize.height > 0)
frameSize.height = minSize.height;
{
frameSize.height = MAX(minSize.height, frameSize.height);
if (maxSize.height > 0)
frameSize.height = MIN(maxSize.height, frameSize.height);
}
[self setFrameSize:frameSize];
}
AppKit/CPTextField.j
+1 -1
View File
@@ -244,8 +244,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
[self _sizeToControlSize];
}
#pragma mark -
#pragma mark -
#if PLATFORM(DOM)
- (DOMElement)_inputElement
AppKit/Themes/Aristo2/ThemeDescriptors.j
+2 -2
View File
@@ -374,7 +374,7 @@ var themedButtonValues = nil,
[@"font", [CPFont boldSystemFontOfSize:11.0]],
[@"min-size", CGSizeMake(32.0, 20.0), CPThemeStateControlSizeSmall],
[@"max-size", CGSizeMake(1.0, 20.0), CPThemeStateControlSizeSmall],
[@"max-size", CGSizeMake(-1.0, 20.0), CPThemeStateControlSizeSmall],
[@"nib2cib-adjustment-frame", CGRectMake(3.0, 4.0, -6.0, 0.0), CPThemeStateControlSizeSmall],
// CPThemeStateControlSizeMini
@@ -386,7 +386,7 @@ var themedButtonValues = nil,
[@"min-size", CGSizeMake(32.0, 16.0), CPThemeStateControlSizeMini],
[@"max-size", CGSizeMake(-1.0, 16.0), CPThemeStateControlSizeMini],
[@"nib2cib-adjustment-frame", CGRectMake(1.0, 10.0, -3.0, 0.0), CPThemeStateControlSizeMini]
[@"nib2cib-adjustment-frame", CGRectMake(1.0, 10.0, -3.0, 0.0), CPThemeStateControlSizeMini]
];
[self registerThemeValues:themeValues forView:button];