colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-06 17:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove arbitrary CONTROL_HEIGHT

Browse Source
This commit is contained in:
Christophe Serafin committed 2014-08-14 10:45:12 -07:00
1 parent bf5b660cb5
commit 655cc3256c
2 files changed
+6 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPRuleEditor/CPRuleEditor.j
+2 -2
View File
@@ -150,7 +150,7 @@ var CPRuleEditorItemPBoardType = @"CPRuleEditorItemPBoardType",
@"font-color": [CPNull null],
@"add-image": [CPNull null],
@"remove-image": [CPNull null],
@"vertical-alignment": [CPNull null]
@"vertical-alignment": [CPNull null],
};
}
@@ -161,7 +161,7 @@ var CPRuleEditorItemPBoardType = @"CPRuleEditorItemPBoardType",
{
_slices = [[CPMutableArray alloc] init];
_sliceHeight = 26.;
_sliceHeight = 26.0;
_nestingMode = CPRuleEditorNestingModeSimple; // 10.5 default is CPRuleEditorNestingModeCompound
_editable = YES;
_allowsEmptyCompoundRows = NO;
AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j
+4 -6
View File
@@ -28,8 +28,6 @@
@global CPMiniControlSize
@global CPSmallControlSize
var CONTROL_HEIGHT = 16.;
@implementation _CPRuleEditorViewSliceRow : _CPRuleEditorViewSlice
{
CPButton _addButton;
@@ -127,7 +125,7 @@ var CONTROL_HEIGHT = 16.;
var title = [[itemsArray objectAtIndex:index] title],
font = [_ruleEditor font],
width = [title sizeWithFont:font].width + 20,
rect = CGRectMake(0, 0, (width - width % 40) + 80, CONTROL_HEIGHT),
rect = CGRectMake(0, 0, (width - width % 40) + 80, [_ruleEditor rowHeight]),
popup = [[CPPopUpButton alloc] initWithFrame:rect];
[popup setValue:font forThemeAttribute:@"font"];
@@ -154,7 +152,7 @@ var CONTROL_HEIGHT = 16.;
localizedText = [[_ruleEditor standardLocalizer] localizedStringForString:text],
size = [localizedText sizeWithFont:font];
[textField setFrameSize:CGSizeMake(size.width + 4, CONTROL_HEIGHT)];
[textField setFrameSize:CGSizeMake(size.width + 4, [_ruleEditor rowHeight])];
[textField setValue:font forThemeAttribute:@"font"];
[textField setValue:[_ruleEditor _verticalAlignment] forThemeAttribute:@"vertical-alignment"];
[textField setStringValue:localizedText];
@@ -383,8 +381,8 @@ var CONTROL_HEIGHT = 16.;
var ruleOptionView = _ruleOptionViews[i],
optionFrame = _ruleOptionFrames[i];
// Align to the top pixel (-1)
optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2 - 1;
// Use a pixel correction to align controls
optionFrame.origin.y = (rowHeight - CGRectGetHeight(optionFrame)) / 2;
if (widthChanged)
{