diff options
| -rw-r--r-- | cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj | 12 | ||||
| -rw-r--r-- | cocoa/ScintillaView.mm | 4 | ||||
| -rw-r--r-- | cocoa/res/info_bar_bg@2x.png | bin | 0 -> 2921 bytes | |||
| -rw-r--r-- | cocoa/res/mac_cursor_busy.png | bin | 1191 -> 5292 bytes | |||
| -rw-r--r-- | cocoa/res/mac_cursor_busy@2x.png | bin | 0 -> 8950 bytes | |||
| -rw-r--r-- | cocoa/res/mac_cursor_flipped.png | bin | 446 -> 4506 bytes | |||
| -rw-r--r-- | cocoa/res/mac_cursor_flipped@2x.png | bin | 0 -> 5779 bytes |
7 files changed, 14 insertions, 2 deletions
diff --git a/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj b/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj index a23624243..8eacfe092 100644 --- a/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj +++ b/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj @@ -196,6 +196,9 @@ 27FEF4540FC1B413005E115A /* info_bar_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEF4510FC1B413005E115A /* info_bar_bg.png */; }; 27FEF4550FC1B413005E115A /* mac_cursor_busy.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEF4520FC1B413005E115A /* mac_cursor_busy.png */; }; 27FEF4560FC1B413005E115A /* mac_cursor_flipped.png in Resources */ = {isa = PBXBuildFile; fileRef = 27FEF4530FC1B413005E115A /* mac_cursor_flipped.png */; }; + 28D516D81830FFCA0047C93D /* info_bar_bg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 28D516D51830FFCA0047C93D /* info_bar_bg@2x.png */; }; + 28D516D91830FFCA0047C93D /* mac_cursor_busy@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 28D516D61830FFCA0047C93D /* mac_cursor_busy@2x.png */; }; + 28D516DA1830FFCA0047C93D /* mac_cursor_flipped@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 28D516D71830FFCA0047C93D /* mac_cursor_flipped@2x.png */; }; 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; }; 8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; }; /* End PBXBuildFile section */ @@ -394,6 +397,9 @@ 27FEF4510FC1B413005E115A /* info_bar_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = info_bar_bg.png; sourceTree = "<group>"; }; 27FEF4520FC1B413005E115A /* mac_cursor_busy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mac_cursor_busy.png; sourceTree = "<group>"; }; 27FEF4530FC1B413005E115A /* mac_cursor_flipped.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mac_cursor_flipped.png; sourceTree = "<group>"; }; + 28D516D51830FFCA0047C93D /* info_bar_bg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "info_bar_bg@2x.png"; sourceTree = "<group>"; }; + 28D516D61830FFCA0047C93D /* mac_cursor_busy@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mac_cursor_busy@2x.png"; sourceTree = "<group>"; }; + 28D516D71830FFCA0047C93D /* mac_cursor_flipped@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mac_cursor_flipped@2x.png"; sourceTree = "<group>"; }; 32DBCF5E0370ADEE00C91783 /* Scintilla_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Scintilla_Prefix.pch; sourceTree = "<group>"; }; 8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 8DC2EF5B0486A6940098B216 /* Scintilla.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Scintilla.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -714,6 +720,9 @@ 27FEF4500FC1B413005E115A /* res */ = { isa = PBXGroup; children = ( + 28D516D51830FFCA0047C93D /* info_bar_bg@2x.png */, + 28D516D61830FFCA0047C93D /* mac_cursor_busy@2x.png */, + 28D516D71830FFCA0047C93D /* mac_cursor_flipped@2x.png */, 27FEF4510FC1B413005E115A /* info_bar_bg.png */, 27FEF4520FC1B413005E115A /* mac_cursor_busy.png */, 27FEF4530FC1B413005E115A /* mac_cursor_flipped.png */, @@ -850,8 +859,11 @@ files = ( 8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */, 27FEF4540FC1B413005E115A /* info_bar_bg.png in Resources */, + 28D516D81830FFCA0047C93D /* info_bar_bg@2x.png in Resources */, + 28D516D91830FFCA0047C93D /* mac_cursor_busy@2x.png in Resources */, 27FEF4550FC1B413005E115A /* mac_cursor_busy.png in Resources */, 27FEF4560FC1B413005E115A /* mac_cursor_flipped.png in Resources */, + 28D516DA1830FFCA0047C93D /* mac_cursor_flipped@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm index b6c39cf05..16d21974a 100644 --- a/cocoa/ScintillaView.mm +++ b/cocoa/ScintillaView.mm @@ -862,11 +862,11 @@ static NSCursor *cursorFromEnum(Window::Cursor cursor) { NSBundle* bundle = [NSBundle bundleForClass: [ScintillaView class]]; - NSString* path = [bundle pathForResource: @"mac_cursor_busy" ofType: @"png" inDirectory: nil]; + NSString* path = [bundle pathForResource: @"mac_cursor_busy" ofType: @"tiff" inDirectory: nil]; NSImage* image = [[[NSImage alloc] initWithContentsOfFile: path] autorelease]; waitCursor = [[NSCursor alloc] initWithImage: image hotSpot: NSMakePoint(2, 2)]; - path = [bundle pathForResource: @"mac_cursor_flipped" ofType: @"png" inDirectory: nil]; + path = [bundle pathForResource: @"mac_cursor_flipped" ofType: @"tiff" inDirectory: nil]; image = [[[NSImage alloc] initWithContentsOfFile: path] autorelease]; reverseArrowCursor = [[NSCursor alloc] initWithImage: image hotSpot: NSMakePoint(12, 2)]; } diff --git a/cocoa/res/info_bar_bg@2x.png b/cocoa/res/info_bar_bg@2x.png Binary files differnew file mode 100644 index 000000000..486646a8e --- /dev/null +++ b/cocoa/res/info_bar_bg@2x.png diff --git a/cocoa/res/mac_cursor_busy.png b/cocoa/res/mac_cursor_busy.png Binary files differindex 9ac82769e..93b2a496b 100644 --- a/cocoa/res/mac_cursor_busy.png +++ b/cocoa/res/mac_cursor_busy.png diff --git a/cocoa/res/mac_cursor_busy@2x.png b/cocoa/res/mac_cursor_busy@2x.png Binary files differnew file mode 100644 index 000000000..7a0e12e83 --- /dev/null +++ b/cocoa/res/mac_cursor_busy@2x.png diff --git a/cocoa/res/mac_cursor_flipped.png b/cocoa/res/mac_cursor_flipped.png Binary files differindex 2c984f248..e1ee68631 100644 --- a/cocoa/res/mac_cursor_flipped.png +++ b/cocoa/res/mac_cursor_flipped.png diff --git a/cocoa/res/mac_cursor_flipped@2x.png b/cocoa/res/mac_cursor_flipped@2x.png Binary files differnew file mode 100644 index 000000000..6fedb33d8 --- /dev/null +++ b/cocoa/res/mac_cursor_flipped@2x.png |
