aboutsummaryrefslogtreecommitdiffstats
path: root/Frameworks/PSMTabBar/Styles
diff options
context:
space:
mode:
authorAbhi Beckert <abhi@abhibeckert.com>2014-12-02 05:29:03 +1000
committerAbhi Beckert <abhi@abhibeckert.com>2014-12-02 05:29:03 +1000
commitb5e972f4504043dfb9c358e272e93fb59ae2127f (patch)
treef1a22749a17e6d01cfb928fbbab00f41acf38be4 /Frameworks/PSMTabBar/Styles
parent1af7e143385e716b5b0154854dda22a9c270ccad (diff)
parent00432038fa8a4727322d8eae25c01fad510b899c (diff)
downloadsequelpro-b5e972f4504043dfb9c358e272e93fb59ae2127f.tar.gz
sequelpro-b5e972f4504043dfb9c358e272e93fb59ae2127f.tar.bz2
sequelpro-b5e972f4504043dfb9c358e272e93fb59ae2127f.zip
Merge pull request #2030 from origsun/master
Remove a private API in PSMTabBarCell
Diffstat (limited to 'Frameworks/PSMTabBar/Styles')
-rw-r--r--Frameworks/PSMTabBar/Styles/PSMAdiumTabStyle.m4
-rw-r--r--Frameworks/PSMTabBar/Styles/PSMAquaTabStyle.m4
-rw-r--r--Frameworks/PSMTabBar/Styles/PSMCardTabStyle.m4
-rw-r--r--Frameworks/PSMTabBar/Styles/PSMMetalTabStyle.m4
-rw-r--r--Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m2
-rw-r--r--Frameworks/PSMTabBar/Styles/PSMUnifiedTabStyle.m4
6 files changed, 11 insertions, 11 deletions
diff --git a/Frameworks/PSMTabBar/Styles/PSMAdiumTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMAdiumTabStyle.m
index 758ebe21..be14707d 100644
--- a/Frameworks/PSMTabBar/Styles/PSMAdiumTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMAdiumTabStyle.m
@@ -757,7 +757,7 @@
[bezier lineToPoint:NSMakePoint(NSMaxX(aRect), NSMaxY(aRect))];
[bezier lineToPoint:NSMakePoint(NSMaxX(aRect), NSMinY(aRect))];
- if ([[cell controlView] frame].size.height < 2) {
+ if ([[cell customControlView] frame].size.height < 2) {
// special case of hidden control; need line across top of cell
[bezier moveToPoint:NSMakePoint(aRect.origin.x, aRect.origin.y + 0.5)];
[bezier lineToPoint:NSMakePoint(aRect.origin.x+aRect.size.width, aRect.origin.y + 0.5)];
@@ -854,7 +854,7 @@
[NSGraphicsContext restoreGraphicsState];
[shadow release];
- [self drawInteriorWithTabCell:cell inView:[cell controlView]];
+ [self drawInteriorWithTabCell:cell inView:[cell customControlView]];
}
- (void)drawBackgroundInRect:(NSRect)rect
diff --git a/Frameworks/PSMTabBar/Styles/PSMAquaTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMAquaTabStyle.m
index 161dbe8d..a96724c0 100644
--- a/Frameworks/PSMTabBar/Styles/PSMAquaTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMAquaTabStyle.m
@@ -340,7 +340,7 @@
else
currentTint = [cell controlTint];
- if (![[[cell controlView] window] isKeyWindow])
+ if (![[[cell customControlView] window] isKeyWindow])
currentTint = NSClearControlTint;
NSImage *bgImage;
@@ -381,7 +381,7 @@
[aquaDivider compositeToPoint:NSMakePoint(cellFrame.origin.x + cellFrame.size.width - 1.0, cellFrame.origin.y + cellFrame.size.height) operation:NSCompositeSourceOver];
}
- [self drawInteriorWithTabCell:cell inView:[cell controlView]];
+ [self drawInteriorWithTabCell:cell inView:[cell customControlView]];
}
- (void)drawBackgroundInRect:(NSRect)rect
diff --git a/Frameworks/PSMTabBar/Styles/PSMCardTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMCardTabStyle.m
index 44f5b098..d81458f1 100644
--- a/Frameworks/PSMTabBar/Styles/PSMCardTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMCardTabStyle.m
@@ -423,7 +423,7 @@
}
}
- [self drawInteriorWithTabCell:cell inView:[cell controlView]];
+ [self drawInteriorWithTabCell:cell inView:[cell customControlView]];
}
@@ -433,7 +433,7 @@
BOOL showsBaselineSeparator = NO;
/*
- NSToolbar *toolbar = [[[cell controlView] window] toolbar];
+ NSToolbar *toolbar = [[[cell customControlView] window] toolbar];
BOOL showsBaselineSeparator = (toolbar && [toolbar respondsToSelector:@selector(showsBaselineSeparator)] && [toolbar showsBaselineSeparator]);
*/
if (!showsBaselineSeparator) {
diff --git a/Frameworks/PSMTabBar/Styles/PSMMetalTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMMetalTabStyle.m
index ace79cf0..cdce6507 100644
--- a/Frameworks/PSMTabBar/Styles/PSMMetalTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMMetalTabStyle.m
@@ -373,7 +373,7 @@
[bezier lineToPoint:NSMakePoint(aRect.origin.x+aRect.size.width-2.5, aRect.origin.y+aRect.size.height)];
[bezier lineToPoint:NSMakePoint(aRect.origin.x+aRect.size.width, aRect.origin.y+aRect.size.height-1.5)];
[bezier lineToPoint:NSMakePoint(aRect.origin.x+aRect.size.width, aRect.origin.y)];
- if ([[cell controlView] frame].size.height < 2) {
+ if ([[cell customControlView] frame].size.height < 2) {
// special case of hidden control; need line across top of cell
[bezier moveToPoint:NSMakePoint(aRect.origin.x, aRect.origin.y+0.5)];
[bezier lineToPoint:NSMakePoint(aRect.origin.x+aRect.size.width, aRect.origin.y+0.5)];
@@ -442,7 +442,7 @@
[NSGraphicsContext restoreGraphicsState];
- [self drawInteriorWithTabCell:cell inView:[cell controlView]];
+ [self drawInteriorWithTabCell:cell inView:[cell customControlView]];
}
diff --git a/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m
index 341b7b7b..5bc8aa3b 100644
--- a/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMSequelProTabStyle.m
@@ -748,7 +748,7 @@ typedef struct {
[NSGraphicsContext restoreGraphicsState];
- [self drawInteriorWithTabCell:cell inView:[cell controlView]];
+ [self drawInteriorWithTabCell:cell inView:[cell customControlView]];
}
diff --git a/Frameworks/PSMTabBar/Styles/PSMUnifiedTabStyle.m b/Frameworks/PSMTabBar/Styles/PSMUnifiedTabStyle.m
index dcf99545..882c1741 100644
--- a/Frameworks/PSMTabBar/Styles/PSMUnifiedTabStyle.m
+++ b/Frameworks/PSMTabBar/Styles/PSMUnifiedTabStyle.m
@@ -312,7 +312,7 @@
{
NSRect cellFrame = [cell frame];
- NSToolbar *toolbar = [[[cell controlView] window] toolbar];
+ NSToolbar *toolbar = [[[cell customControlView] window] toolbar];
BOOL showsBaselineSeparator = (toolbar && [toolbar respondsToSelector:@selector(showsBaselineSeparator)] && [toolbar showsBaselineSeparator]);
if (!showsBaselineSeparator) {
cellFrame.origin.y += 1.0;
@@ -409,7 +409,7 @@
}
}
- [self drawInteriorWithTabCell:cell inView:[cell controlView]];
+ [self drawInteriorWithTabCell:cell inView:[cell customControlView]];
}