Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

nib2cib allows CPCheckBox and CPRadio to have themed height #1694

Merged
merged 1 commit into from

5 participants

Martin Carlberg CappBot Andrew Hankinson Aparajita Fishman Antoine Mercadal
Martin Carlberg
Collaborator

and adjusts it correctly.

CappBot
Collaborator

Milestone: Someday. Label: #new. What's next? A reviewer should examine this issue.

Andrew Hankinson

I've verified that this PR merges, builds, tests, and is ready to commit.

+#accepted
+#ready-to-commit

CappBot
Collaborator

Milestone: Someday. Labels: #accepted, #ready-to-commit. What's next? The changes for this issue are ready to be committed by a member of the core team.

Aparajita Fishman
Owner

Do we have a test case to show before and after?

Antoine Mercadal primalmotion was assigned
Aparajita Fishman
Owner

assigned=primalmotion

Antoine should be the one to look at this.

CappBot
Collaborator

Assignee: primalmotion. Milestone: Someday. Labels: #accepted, #ready-to-commit. What's next? The changes for this issue are ready to be committed by primalmotion.

Antoine Mercadal

It seems good.

+#ready-to-commit

Antoine Mercadal primalmotion merged commit 6673823 into from
Antoine Mercadal

Merged. Thanks!

+#fixed

CappBot
Collaborator

Assignee: primalmotion. Milestone: Someday. Label: #fixed. What's next? This issue is considered successfully resolved.

CappBot
Collaborator

Assignee: primalmotion. Milestone: Someday. Labels: #accepted, #ready-to-commit. What's next? The changes for this issue are ready to be committed by primalmotion.

CappBot
Collaborator

Assignee: primalmotion. Milestone: Someday. Label: #fixed. What's next? This issue is considered successfully resolved.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 29, 2012
  1. Martin Carlberg
This page is out of date. Refresh to see the latest.
Showing with 9 additions and 6 deletions.
  1. +9 −6 Tools/nib2cib/NSButton.j
15 Tools/nib2cib/NSButton.j
View
@@ -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];
Something went wrong with that request. Please try again.