Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

nib2cib allows CPCheckBox and CPRadio to have themed height and adjus…

…ts it correctly
  • Loading branch information...
commit 744f3d70eddb1319dc243c32cddce3770fab3485 1 parent e28a78a
@mrcarlberg authored
Showing with 9 additions and 6 deletions.
  1. +9 −6 Tools/nib2cib/NSButton.j
View
15 Tools/nib2cib/NSButton.j
@@ -209,7 +209,7 @@ var NSButtonIsBorderedMask = 0x00800000,
fixedHeight = YES;
}
- if ([cell isBordered])
+ if ([cell isBordered] || [self isKindOfClass:[CPRadio class]] || [self isKindOfClass:[CPCheckBox class]])
{
/*
Try to figure out the intention of the theme in regards to fixed height buttons.
@@ -248,11 +248,14 @@ var NSButtonIsBorderedMask = 0x00800000,
CPLog.debug("NSButton [%s]: adjusted height from %d to %d", _title == null ? "<no title>" : '"' + _title + '"', oldHeight, _frame.size.height);
}
- // Reposition the buttons according to its particular offsets
- _frame.origin.x += positionOffsetOriginX;
- _frame.origin.y += positionOffsetOriginY;
- _frame.size.width += positionOffsetSizeWidth;
- _bounds.size.width += positionOffsetSizeWidth;
+ if ([cell isBordered])
+ {
+ // Reposition the buttons according to its particular offsets
+ _frame.origin.x += positionOffsetOriginX;
+ _frame.origin.y += positionOffsetOriginY;
+ _frame.size.width += positionOffsetSizeWidth;
+ _bounds.size.width += positionOffsetSizeWidth;
+ }
}
_keyEquivalent = [cell keyEquivalent];
Please sign in to comment.
Something went wrong with that request. Please try again.