From d833defa8af0ff9906553b59cf6f714fd1e790fd Mon Sep 17 00:00:00 2001 From: Eric Doughty-Papassideris Date: Mon, 13 Dec 2010 01:56:58 +0100 Subject: [PATCH] TIL Release mode doesn't like the CGStructs and wants NS... --- src/Visor.h | 10 +++++----- src/Visor.m | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Visor.h b/src/Visor.h index 94c90dc..1372856 100644 --- a/src/Visor.h +++ b/src/Visor.h @@ -30,8 +30,8 @@ id runningApplicationClass_; BOOL runningOnLeopard_; BOOL dontShowOnFirstTab; - CGSize originalPreferencesSize; - CGSize prefPaneSize; + NSSize originalPreferencesSize; + NSSize prefPaneSize; } - (NSWindow *)window; @@ -40,9 +40,9 @@ - (void)setBackground:(NSWindow*)newBackground; - (BOOL)isHidden; -- (CGSize)originalPreferencesSize; -- (void)setOriginalPreferencesSize:(CGSize)size; -- (CGSize)prefPaneSize; +- (NSSize)originalPreferencesSize; +- (void)setOriginalPreferencesSize:(NSSize)size; +- (NSSize)prefPaneSize; - (IBAction)showTransparencyHelpPanel:(id)sender; - (IBAction)closeTransparencyHelpPanel:(id)sender; diff --git a/src/Visor.m b/src/Visor.m index ce709a9..61066ea 100644 --- a/src/Visor.m +++ b/src/Visor.m @@ -112,8 +112,8 @@ int main(int argc, char *argv[]) { - (void)Visor_TTAppPrefsController_tabView:(id)view didSelectTabViewItem:(NSTabViewItem *)tab { LOG(@"Visor_TTAppPrefsController_tabView => %@", tab); Visor *visor = [Visor sharedInstance]; - CGSize originalSize; - originalSize = (CGSize)[visor originalPreferencesSize]; + NSSize originalSize; + originalSize = (NSSize)[visor originalPreferencesSize]; NSWindow* prefsWindow = [self window]; NSRect frame = [prefsWindow contentRectForFrameRect:[prefsWindow frame]]; if (originalSize.width == 0) { @@ -122,7 +122,7 @@ int main(int argc, char *argv[]) { } if ([[tab identifier] isEqualToString:@"VisorPane"]) { NSRect viewItemFrame = [[[[self valueForKey:@"tabView"] tabViewItemAtIndex:0] view] frame]; - CGSize visorPrefpanelSize = [visor prefPaneSize]; + NSSize visorPrefpanelSize = [visor prefPaneSize]; frame.size.width += visorPrefpanelSize.width - viewItemFrame.size.width; frame.size.height += visorPrefpanelSize.height - viewItemFrame.size.height; frame.origin.y -= visorPrefpanelSize.height - viewItemFrame.size.height; @@ -636,15 +636,15 @@ static const size_t kModifierEventTypeSpecSize = sizeof(kModifierEventTypeSpec) prefPaneSize = [[item view] frame].size; } -- (CGSize) originalPreferencesSize { +- (NSSize) originalPreferencesSize { return originalPreferencesSize; } -- (void) setOriginalPreferencesSize:(CGSize)size { +- (void) setOriginalPreferencesSize:(NSSize)size { originalPreferencesSize = size; } -- (CGSize)prefPaneSize { +- (NSSize)prefPaneSize { return prefPaneSize; }