diff --git a/.gitignore b/.gitignore index 252e58e..cb9cb4a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xcuserdata *.xccheckout *.xcuserstate build/ +Snapshots.xcodeproj/xcuserdata/ \ No newline at end of file diff --git a/SnapshotDiffs/ORSnapshotDiffs.m b/SnapshotDiffs/ORSnapshotDiffs.m index ef74be2..7704891 100644 --- a/SnapshotDiffs/ORSnapshotDiffs.m +++ b/SnapshotDiffs/ORSnapshotDiffs.m @@ -47,7 +47,7 @@ + (void)pluginDidLoad:(NSBundle *)plugin // Get the original switch view NSView *switchView = orig.view; - CGSize viewSize = (CGSize){ 160, 25 }; + CGSize viewSize = (CGSize){ 137, 25 }; // Make a new container that's wider NSView *holder = [[NSView alloc] initWithFrame:(CGRect){0, 0, viewSize}]; @@ -61,14 +61,9 @@ + (void)pluginDidLoad:(NSBundle *)plugin NSBundle *bundle = [NSBundle bundleForClass:ORSnapshotDiffs.class]; NSImage *image = [bundle imageForResource:@"SnapshotToolbarIcon"]; - NSImage *separatorImage = [bundle imageForResource:@"SeparatorImage"]; - - NSImageView *imageView = [[NSImageView alloc] initWithFrame:CGRectMake(newSwitchFrame.origin.x - 10, 3, 2, 18)]; - imageView.image = separatorImage; - [holder addSubview:imageView]; - + // Make the damn button - CGRect snapshotFrame = CGRectMake(imageView.frame.origin.x - 8 - image.size.width, 0, image.size.width, image.size.height); + CGRect snapshotFrame = CGRectMake(0, 0, image.size.width, image.size.height); NSButton *snapshotButton = [[NSButton alloc] initWithFrame:snapshotFrame]; snapshotButton.image = image; snapshotButton.alternateImage = image; diff --git a/SnapshotDiffs/SeparatorImage.png b/SnapshotDiffs/SeparatorImage.png deleted file mode 100644 index a977691..0000000 Binary files a/SnapshotDiffs/SeparatorImage.png and /dev/null differ diff --git a/Snapshots.xcodeproj/project.pbxproj b/Snapshots.xcodeproj/project.pbxproj index e52523d..8f335ef 100644 --- a/Snapshots.xcodeproj/project.pbxproj +++ b/Snapshots.xcodeproj/project.pbxproj @@ -26,7 +26,6 @@ 6020BD7A194E14E10027B265 /* BackArrowActive.png in Resources */ = {isa = PBXBuildFile; fileRef = 6020BD78194E14E10027B265 /* BackArrowActive.png */; }; 6020BD7B194E14E10027B265 /* BackArrow.png in Resources */ = {isa = PBXBuildFile; fileRef = 6020BD79194E14E10027B265 /* BackArrow.png */; }; 6020BD88194E3F7B0027B265 /* ORSlidingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6020BD87194E3F7B0027B265 /* ORSlidingImageView.m */; }; - 6020BD8A194E50DE0027B265 /* SeparatorImage.png in Resources */ = {isa = PBXBuildFile; fileRef = 6020BD89194E50DE0027B265 /* SeparatorImage.png */; }; 605A0232194A34A500920397 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 605A0231194A34A500920397 /* AppKit.framework */; }; 605A0234194A34A500920397 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 605A0233194A34A500920397 /* Foundation.framework */; }; 605A023A194A34A500920397 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 605A0238194A34A500920397 /* InfoPlist.strings */; }; @@ -69,7 +68,6 @@ 6020BD79194E14E10027B265 /* BackArrow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = BackArrow.png; sourceTree = ""; }; 6020BD86194E3F7B0027B265 /* ORSlidingImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ORSlidingImageView.h; sourceTree = ""; }; 6020BD87194E3F7B0027B265 /* ORSlidingImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ORSlidingImageView.m; sourceTree = ""; }; - 6020BD89194E50DE0027B265 /* SeparatorImage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = SeparatorImage.png; sourceTree = ""; }; 605A022E194A34A500920397 /* Snapshots.xcplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Snapshots.xcplugin; sourceTree = BUILT_PRODUCTS_DIR; }; 605A0231194A34A500920397 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 605A0233194A34A500920397 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -208,7 +206,6 @@ 605A0236194A34A500920397 /* Supporting Files */ = { isa = PBXGroup; children = ( - 6020BD89194E50DE0027B265 /* SeparatorImage.png */, 6020BD78194E14E10027B265 /* BackArrowActive.png */, 6020BD79194E14E10027B265 /* BackArrow.png */, 6020BD74194E09470027B265 /* ViewDiffImageActive.png */, @@ -316,7 +313,6 @@ 6018B70F194DEFB4001981D7 /* OutputExamples in Resources */, 60D4D718198F1B6C001AB8AF /* SnapshotToolbarIconError.png in Resources */, 6020BD76194E09470027B265 /* ViewDiffImageActive.png in Resources */, - 6020BD8A194E50DE0027B265 /* SeparatorImage.png in Resources */, 605A023A194A34A500920397 /* InfoPlist.strings in Resources */, 6020BD73194E08210027B265 /* KaleidoscopeAllButtonActive.png in Resources */, ); diff --git a/Snapshots.xcodeproj/xcuserdata/orta.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Snapshots.xcodeproj/xcuserdata/orta.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist deleted file mode 100644 index 3341309..0000000 --- a/Snapshots.xcodeproj/xcuserdata/orta.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/Snapshots.xcodeproj/xcuserdata/orta.xcuserdatad/xcschemes/SnapshotDiffs.xcscheme b/Snapshots.xcodeproj/xcuserdata/orta.xcuserdatad/xcschemes/SnapshotDiffs.xcscheme deleted file mode 100644 index 23d3e23..0000000 --- a/Snapshots.xcodeproj/xcuserdata/orta.xcuserdatad/xcschemes/SnapshotDiffs.xcscheme +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -