actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Variable naming cleanup to match normal SM style.

Browse Source
This commit is contained in:
Steve Checkoway
2008-03-21 11:13:05 +00:00
parent 918d5a3ccf
commit 00c5e91c7b
1 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.mm
+36 -36
View File
@@ -7,8 +7,8 @@
@interface LoadingWindowHelper : NSObject @interface LoadingWindowHelper : NSObject
{ {
@public @public
NSWindow *m_window; NSWindow *m_Window;
NSTextView *m_text; NSTextView *m_Text;
NSAutoreleasePool *m_Pool; NSAutoreleasePool *m_Pool;
} }
- (void) setupWindow:(NSImage *)image; - (void) setupWindow:(NSImage *)image;
@@ -25,20 +25,20 @@
NSRect textRect; NSRect textRect;
// Just give it a size until it is created. // Just give it a size until it is created.
textRect = NSMakeRect( 0, 0, size.width, size.height ); textRect = NSMakeRect( 0, 0, size.width, size.height );
m_text = [[NSTextView alloc] initWithFrame:textRect]; m_Text = [[NSTextView alloc] initWithFrame:textRect];
[m_text setFont:font]; [m_Text setFont:font];
height = [[m_text layoutManager] defaultLineHeightForFont:font]*3 + 4; height = [[m_Text layoutManager] defaultLineHeightForFont:font]*3 + 4;
textRect = NSMakeRect( 0, 0, size.width, height ); textRect = NSMakeRect( 0, 0, size.width, height );
[m_text setFrame:textRect]; [m_Text setFrame:textRect];
[m_text setEditable:NO]; [m_Text setEditable:NO];
[m_text setSelectable:NO]; [m_Text setSelectable:NO];
[m_text setDrawsBackground:YES]; [m_Text setDrawsBackground:YES];
[m_text setBackgroundColor:[NSColor lightGrayColor]]; [m_Text setBackgroundColor:[NSColor lightGrayColor]];
[m_text setAlignment:NSCenterTextAlignment]; [m_Text setAlignment:NSCenterTextAlignment];
[m_text setHorizontallyResizable:NO]; [m_Text setHorizontallyResizable:NO];
[m_text setVerticallyResizable:NO]; [m_Text setVerticallyResizable:NO];
[m_text setString:@"Initializing Hardware..."]; [m_Text setString:@"Initializing Hardware..."];
viewRect = NSMakeRect( 0, height, size.width, size.height ); viewRect = NSMakeRect( 0, height, size.width, size.height );
NSImageView *iView = [[NSImageView alloc] initWithFrame:viewRect]; NSImageView *iView = [[NSImageView alloc] initWithFrame:viewRect];
@@ -46,33 +46,33 @@
[iView setImageFrameStyle:NSImageFrameNone]; [iView setImageFrameStyle:NSImageFrameNone];
windowRect = NSMakeRect( 0, 0, size.width, size.height + height ); windowRect = NSMakeRect( 0, 0, size.width, size.height + height );
m_window = [[NSWindow alloc] initWithContentRect:windowRect m_Window = [[NSWindow alloc] initWithContentRect:windowRect
styleMask:NSTitledWindowMask styleMask:NSTitledWindowMask
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
defer:YES]; defer:YES];
NSView *view = [m_window contentView]; NSView *view = [m_Window contentView];
// Set some properties. // Set some properties.
[m_window setOneShot:YES]; [m_Window setOneShot:YES];
[m_window setReleasedWhenClosed:YES]; [m_Window setReleasedWhenClosed:YES];
[m_window setExcludedFromWindowsMenu:YES]; [m_Window setExcludedFromWindowsMenu:YES];
[m_window useOptimizedDrawing:YES]; [m_Window useOptimizedDrawing:YES];
[m_window setTitle:@PRODUCT_FAMILY]; [m_Window setTitle:@PRODUCT_FAMILY];
[m_window center]; [m_Window center];
// Set subviews. // Set subviews.
[view addSubview:m_text]; [view addSubview:m_Text];
[view addSubview:iView]; [view addSubview:iView];
[m_text release]; [m_Text release];
[iView release]; [iView release];
// Display the window. // Display the window.
[m_window makeKeyAndOrderFront:nil]; [m_Window makeKeyAndOrderFront:nil];
} }
@end @end
static LoadingWindowHelper *g_helper = nil; static LoadingWindowHelper *g_Helper = nil;
LoadingWindow_Cocoa::LoadingWindow_Cocoa() LoadingWindow_Cocoa::LoadingWindow_Cocoa()
{ {
@@ -98,29 +98,29 @@ LoadingWindow_Cocoa::LoadingWindow_Cocoa()
return; return;
} }
g_helper = [[LoadingWindowHelper alloc] init]; g_Helper = [[LoadingWindowHelper alloc] init];
g_helper->m_Pool = pool; g_Helper->m_Pool = pool;
[g_helper performSelectorOnMainThread:@selector(setupWindow:) withObject:image waitUntilDone:YES]; [g_Helper performSelectorOnMainThread:@selector(setupWindow:) withObject:image waitUntilDone:YES];
[image release]; [image release];
} }
LoadingWindow_Cocoa::~LoadingWindow_Cocoa() LoadingWindow_Cocoa::~LoadingWindow_Cocoa()
{ {
if( !g_helper ) if( !g_Helper )
return; return;
NSAutoreleasePool *pool = g_helper->m_Pool; NSAutoreleasePool *pool = g_Helper->m_Pool;
[g_helper->m_window performSelectorOnMainThread:@selector(close) withObject:nil waitUntilDone:YES]; [g_Helper->m_Window performSelectorOnMainThread:@selector(close) withObject:nil waitUntilDone:YES];
[g_helper release]; [g_Helper release];
g_helper = nil; g_Helper = nil;
[pool release]; [pool release];
} }
void LoadingWindow_Cocoa::SetText( RString str ) void LoadingWindow_Cocoa::SetText( RString str )
{ {
if( !g_helper ) if( !g_Helper )
return; return;
NSString *s = [[NSString alloc] initWithUTF8String:str]; NSString *s = [[NSString alloc] initWithUTF8String:str];
[g_helper->m_text performSelectorOnMainThread:@selector(setString:) withObject:(s ? s : @"") waitUntilDone:NO]; [g_Helper->m_Text performSelectorOnMainThread:@selector(setString:) withObject:(s ? s : @"") waitUntilDone:NO];
[s release]; [s release];
} }