darlinghq/darling-cocotron
1
0
Fork 0
mirror of https://github.com/darlinghq/darling-cocotron.git synced 2024-11-27 14:00:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Issue #151, Alexei Svitkine's fix for dropping files from windows explorer

Browse Source 
- Issue #180, Alexei Svitkine's fix for generating alpha mask from windows icon
This commit is contained in:
Christopher Lloyd 2008-09-26 13:56:17 +00:00
parent 1cf32bebaa
commit dca3526cf5
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
AppKit/Win32.subproj/Win32DraggingManager.subproj/Win32DropPasteboard.m
View File

@ -26,7 +26,16 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
}
-(NSData *)dataForType:(NSString *)type {
return [_dataClient dataForType:type];
if([type isEqualToString:NSFilenamesPboardType]) {
NSString *error=nil;
NSData *result=[NSPropertyListSerialization dataFromPropertyList:[_dataClient filenames] format:NSPropertyListXMLFormat_v1_0 errorDescription:&error];
if(error) {
NSLog(@"Error: %@", error);
[error release];
}
return result;
} else
return [_dataClient dataForType:type];
}
-(id)propertyListForType:(NSString *)type {

2
AppKit/Win32.subproj/Win32Workspace.m
View File

@ -89,7 +89,7 @@ static NSImageRep *imageRepForIcon(SHFILEINFO * fileInfo) {
}
}
#define BIT_SET(x,y) (((x) >> (8-(y))) & 1)
#define BIT_SET(x,y) (((x) >> (7-(y))) & 1)
if (!hasAlpha) {
for (i = 0; i < masklen; i++) {

10
Foundation/NSPropertyList/NSPropertyList.m
View File

@ -41,18 +41,18 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
@try{
if((result=[NSPropertyListReader_xml1 propertyListFromData:data])!=nil){
*format=NSPropertyListXMLFormat_v1_0;
if((result=[NSPropertyListReader_xml1 propertyListFromData:data])!=nil){
if(format)*format=NSPropertyListXMLFormat_v1_0;
return result;
}
if((result=[NSPropertyListReader_binary1 propertyListFromData:data])!=nil){
*format=NSPropertyListBinaryFormat_v1_0;
return result;
if(format)*format=NSPropertyListBinaryFormat_v1_0;
return result;
}
if((result=[NSPropertyListReader_vintage propertyListFromData:data])!=nil){
*format=NSPropertyListOpenStepFormat;
if(format)*format=NSPropertyListOpenStepFormat;
return result;
}
}