Fixing indentations and a few formatting issues
This commit is contained in:
parent
cdba3c691a
commit
ccf278d144
@ -764,5 +764,3 @@ static bool CommandList_isEmpty(CommandList* list)
|
|||||||
{
|
{
|
||||||
return (!list->first && !list->last);
|
return (!list->first && !list->last);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -35,4 +35,3 @@ void Commands_endMulti();
|
|||||||
int Commands_undoCount();
|
int Commands_undoCount();
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@ -5,4 +5,3 @@
|
|||||||
int Dialog_open(text_t* dest);
|
int Dialog_open(text_t* dest);
|
||||||
int Dialog_save(text_t* dest);
|
int Dialog_save(text_t* dest);
|
||||||
void Dialog_showError(const text_t* text);
|
void Dialog_showError(const text_t* text);
|
||||||
|
|
||||||
|
|||||||
@ -1989,4 +1989,3 @@ bool Editor_keyDown(int key, int keyCode, int modifiers)
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -24,4 +24,3 @@ text_t** Editor_getRecentFiles();
|
|||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#define EDITOR_VERSION _T(" 1.1 Beta 1 ")
|
#define EDITOR_VERSION _T(" 1.1 Beta 1 ")
|
||||||
|
|
||||||
|
|||||||
@ -428,4 +428,3 @@ unsigned char g_arrow_left_png[] = {
|
|||||||
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
|
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82
|
||||||
};
|
};
|
||||||
int g_arrow_left_png_len = 2519;
|
int g_arrow_left_png_len = 2519;
|
||||||
|
|
||||||
|
|||||||
@ -4,4 +4,3 @@ extern unsigned char g_arrow_left_png[];
|
|||||||
extern int g_arrow_left_png_len;
|
extern int g_arrow_left_png_len;
|
||||||
extern unsigned char g_arrow_right_png[];
|
extern unsigned char g_arrow_right_png[];
|
||||||
extern int g_arrow_right_png_len;
|
extern int g_arrow_right_png_len;
|
||||||
|
|
||||||
|
|||||||
@ -97,4 +97,3 @@ MenuDescriptor g_viewMenu[] =
|
|||||||
{ _T("Jump row,start/end & edit"), EDITOR_MENU_TAB, EMGUI_KEY_TAB, 0, 0 },
|
{ _T("Jump row,start/end & edit"), EDITOR_MENU_TAB, EMGUI_KEY_TAB, 0, 0 },
|
||||||
{ 0 },
|
{ 0 },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -120,4 +120,3 @@ typedef struct MenuDescriptor
|
|||||||
extern MenuDescriptor g_fileMenu[];
|
extern MenuDescriptor g_fileMenu[];
|
||||||
extern MenuDescriptor g_editMenu[];
|
extern MenuDescriptor g_editMenu[];
|
||||||
extern MenuDescriptor g_viewMenu[];
|
extern MenuDescriptor g_viewMenu[];
|
||||||
|
|
||||||
|
|||||||
@ -365,4 +365,3 @@ struct MicroknightLayout s_microknightLayout[] =
|
|||||||
{ 72, 117 },
|
{ 72, 117 },
|
||||||
{ 81, 117 },
|
{ 81, 117 },
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -12,4 +12,3 @@ typedef struct MicroknightLayout
|
|||||||
|
|
||||||
extern unsigned char s_microkinghtFontData[];
|
extern unsigned char s_microkinghtFontData[];
|
||||||
extern struct MicroknightLayout s_microknightLayout[];
|
extern struct MicroknightLayout s_microknightLayout[];
|
||||||
|
|
||||||
|
|||||||
@ -5,4 +5,3 @@
|
|||||||
extern EmguiFontLayout g_minecraftiaFontLayout[];
|
extern EmguiFontLayout g_minecraftiaFontLayout[];
|
||||||
extern char g_minecraftiaFont[];
|
extern char g_minecraftiaFont[];
|
||||||
extern int g_minecraftiaFontSize;
|
extern int g_minecraftiaFontSize;
|
||||||
|
|
||||||
|
|||||||
@ -513,4 +513,3 @@ void RemoteConnection_close()
|
|||||||
closesocket(s_serverSocket);
|
closesocket(s_serverSocket);
|
||||||
s_serverSocket = INVALID_SOCKET;
|
s_serverSocket = INVALID_SOCKET;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -32,4 +32,3 @@ void RemoteConnection_sendKeyFrames(const char* name, struct sync_track* track);
|
|||||||
void RemoteConnection_mapTrackName(const char* name);
|
void RemoteConnection_mapTrackName(const char* name);
|
||||||
|
|
||||||
void RemoteConnection_getConnectionStatus(char** status);
|
void RemoteConnection_getConnectionStatus(char** status);
|
||||||
|
|
||||||
|
|||||||
@ -382,6 +382,3 @@ int TrackData_getPrevLoopmark(TrackData* trackData, int row)
|
|||||||
{
|
{
|
||||||
return getPrevMark(trackData->loopmarks, trackData->loopmarkCount, row, -1);
|
return getPrevMark(trackData->loopmarks, trackData->loopmarkCount, row, -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -108,4 +108,3 @@ uint32_t TrackData_getNextColor(TrackData* trackData);
|
|||||||
void TrackData_linkGroups(TrackData* trackData);
|
void TrackData_linkGroups(TrackData* trackData);
|
||||||
void TrackData_linkTrack(int index, const char* name, TrackData* trackData);
|
void TrackData_linkTrack(int index, const char* name, TrackData* trackData);
|
||||||
void TrackData_setActiveTrack(TrackData* trackData, int track);
|
void TrackData_setActiveTrack(TrackData* trackData, int track);
|
||||||
|
|
||||||
|
|||||||
@ -858,4 +858,3 @@ int TrackView_getTracksOffset(TrackViewInfo* viewInfo, TrackData* trackData, int
|
|||||||
|
|
||||||
return nextOffset - prevOffset;
|
return nextOffset - prevOffset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -40,4 +40,3 @@ int TrackView_getScrolledTrack(struct TrackViewInfo* viewInfo, struct TrackData*
|
|||||||
int TrackView_getStartOffset();
|
int TrackView_getStartOffset();
|
||||||
int TrackView_getTracksOffset(struct TrackViewInfo* viewInfo, struct TrackData* trackData, int prevTrack, int nextTrack);
|
int TrackView_getTracksOffset(struct TrackViewInfo* viewInfo, struct TrackData* trackData, int prevTrack, int nextTrack);
|
||||||
bool TrackView_isSelectedTrackVisible(struct TrackViewInfo* viewInfo, struct TrackData* trackData, int track);
|
bool TrackView_isSelectedTrackVisible(struct TrackViewInfo* viewInfo, struct TrackData* trackData, int track);
|
||||||
|
|
||||||
|
|||||||
@ -7,4 +7,3 @@
|
|||||||
void Window_setTitle(const text_t* title);
|
void Window_setTitle(const text_t* title);
|
||||||
void Window_populateRecentList(const text_t** files);
|
void Window_populateRecentList(const text_t** files);
|
||||||
void Window_buildMenu();
|
void Window_buildMenu();
|
||||||
|
|
||||||
|
|||||||
@ -453,4 +453,3 @@ int LoadSave_saveRocketXMLDialog(text_t* path, TrackData* trackData)
|
|||||||
|
|
||||||
return LoadSave_saveRocketXML(path, trackData);
|
return LoadSave_saveRocketXML(path, trackData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -8,4 +8,3 @@ int LoadSave_loadRocketXML(const text_t* path, struct TrackData* trackData);
|
|||||||
int LoadSave_loadRocketXMLDialog(text_t* path, struct TrackData* trackData);
|
int LoadSave_loadRocketXMLDialog(text_t* path, struct TrackData* trackData);
|
||||||
int LoadSave_saveRocketXML(const text_t* path, struct TrackData* trackData);
|
int LoadSave_saveRocketXML(const text_t* path, struct TrackData* trackData);
|
||||||
int LoadSave_saveRocketXMLDialog(text_t* path, struct TrackData* trackData);
|
int LoadSave_saveRocketXMLDialog(text_t* path, struct TrackData* trackData);
|
||||||
|
|
||||||
|
|||||||
@ -132,10 +132,10 @@ void Dialog_showColorPicker(uint32_t* color)
|
|||||||
//Get the shared color panel along with the chosen color and set the chosen color
|
//Get the shared color panel along with the chosen color and set the chosen color
|
||||||
NSColor* theColor = [[theColorPanel color] colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
|
NSColor* theColor = [[theColorPanel color] colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
|
||||||
|
|
||||||
*color = Emgui_color32((unsigned char) ([theColor redComponent] * 255.0),
|
*color = Emgui_color32( (unsigned char) ([theColor redComponent] * 255.0),
|
||||||
(unsigned char) ([theColor greenComponent] * 255.0),
|
(unsigned char) ([theColor greenComponent] * 255.0),
|
||||||
(unsigned char) ([theColor blueComponent] * 255.0),
|
(unsigned char) ([theColor blueComponent] * 255.0),
|
||||||
255);
|
255 );
|
||||||
|
|
||||||
[thePool release];
|
[thePool release];
|
||||||
}
|
}
|
||||||
@ -151,4 +151,3 @@ void Dialog_showError(const text_t* text)
|
|||||||
|
|
||||||
[pool drain];
|
[pool drain];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -6,4 +6,3 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
|
|||||||
@ -181,7 +181,9 @@ static int getModifierFlags(int flags)
|
|||||||
-(void) viewWillMoveToWindow:(NSWindow *)newWindow
|
-(void) viewWillMoveToWindow:(NSWindow *)newWindow
|
||||||
{
|
{
|
||||||
NSTrackingArea* trackingArea = [[NSTrackingArea alloc] initWithRect:[self frame]
|
NSTrackingArea* trackingArea = [[NSTrackingArea alloc] initWithRect:[self frame]
|
||||||
options: (NSTrackingMouseMoved | NSTrackingActiveAlways) owner:self userInfo:nil];
|
options: (NSTrackingMouseMoved | NSTrackingActiveAlways)
|
||||||
|
owner:self
|
||||||
|
userInfo:nil];
|
||||||
[self addTrackingArea:trackingArea];
|
[self addTrackingArea:trackingArea];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -258,21 +260,18 @@ static int getModifierFlags(int flags)
|
|||||||
CFStringRef createStringForKey(CGKeyCode keyCode)
|
CFStringRef createStringForKey(CGKeyCode keyCode)
|
||||||
{
|
{
|
||||||
TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
|
TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource();
|
||||||
CFDataRef layoutData =
|
CFDataRef layoutData = TISGetInputSourceProperty(currentKeyboard, kTISPropertyUnicodeKeyLayoutData);
|
||||||
TISGetInputSourceProperty(currentKeyboard,
|
|
||||||
kTISPropertyUnicodeKeyLayoutData);
|
|
||||||
|
|
||||||
if (!layoutData)
|
if (!layoutData)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
const UCKeyboardLayout *keyboardLayout =
|
const UCKeyboardLayout *keyboardLayout = (const UCKeyboardLayout *)CFDataGetBytePtr(layoutData);
|
||||||
(const UCKeyboardLayout *)CFDataGetBytePtr(layoutData);
|
|
||||||
|
|
||||||
UInt32 keysDown = 0;
|
UInt32 keysDown = 0;
|
||||||
UniChar chars[4];
|
UniChar chars[4];
|
||||||
UniCharCount realLength;
|
UniCharCount realLength;
|
||||||
|
|
||||||
UCKeyTranslate(keyboardLayout,
|
UCKeyTranslate( keyboardLayout,
|
||||||
keyCode,
|
keyCode,
|
||||||
kUCKeyActionDisplay,
|
kUCKeyActionDisplay,
|
||||||
0,
|
0,
|
||||||
@ -281,7 +280,7 @@ CFStringRef createStringForKey(CGKeyCode keyCode)
|
|||||||
&keysDown,
|
&keysDown,
|
||||||
sizeof(chars) / sizeof(chars[0]),
|
sizeof(chars) / sizeof(chars[0]),
|
||||||
&realLength,
|
&realLength,
|
||||||
chars);
|
chars );
|
||||||
CFRelease(currentKeyboard);
|
CFRelease(currentKeyboard);
|
||||||
|
|
||||||
return CFStringCreateWithCharacters(kCFAllocatorDefault, chars, 1);
|
return CFStringCreateWithCharacters(kCFAllocatorDefault, chars, 1);
|
||||||
@ -511,5 +510,3 @@ void Window_setTitle(const char* title)
|
|||||||
{
|
{
|
||||||
[g_window setTitle:[NSString stringWithUTF8String:title]];
|
[g_window setTitle:[NSString stringWithUTF8String:title]];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
|
|
||||||
@interface RocketAppDelegate : NSObject <NSApplicationDelegate> {
|
@interface RocketAppDelegate : NSObject <NSApplicationDelegate> {
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
#import <OpenGL/OpenGL.h>
|
#import <OpenGL/OpenGL.h>
|
||||||
#import <Cocoa/Cocoa.h>
|
#import <Cocoa/Cocoa.h>
|
||||||
|
|
||||||
|
|||||||
@ -21,4 +21,3 @@ static EMGUI_INLINE int mini(int a, int b)
|
|||||||
|
|
||||||
return b;
|
return b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -52,4 +52,3 @@ void rlog_level_pop()
|
|||||||
{
|
{
|
||||||
s_log_level = s_old_level;
|
s_log_level = s_old_level;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -11,4 +11,3 @@ void rlog(int logLevel, const char* format, ...);
|
|||||||
void rlog_set_level(int logLevel);
|
void rlog_set_level(int logLevel);
|
||||||
void rlog_level_push();
|
void rlog_level_push();
|
||||||
void rlog_level_pop();
|
void rlog_level_pop();
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user