i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When dragging an icon into an icon view that gets its icon from its MIME type,

Browse Source 
the vector icon is now retrieved as well.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19296 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-11-15 17:49:22 +00:00
parent 8c34572bab
commit 035f2c2a4d
2 changed files with 79 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/filetypes/IconView.cpp
+77 -5
View File
@@ -28,6 +28,66 @@
using namespace std;
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
status_t
icon_for_type(BMimeType& type, uint8** _data, size_t* _size,
icon_source* _source)
{
if (_data == NULL || _size == NULL)
return B_BAD_VALUE;
icon_source source = kNoIcon;
uint8* data;
size_t size;
if (type.GetIcon(&data, &size) == B_OK)
source = kOwnIcon;
if (source == kNoIcon) {
// check for icon from preferred app
char preferred[B_MIME_TYPE_LENGTH];
if (type.GetPreferredApp(preferred) == B_OK) {
BMimeType preferredApp(preferred);
if (preferredApp.GetIconForType(type.Type(), &data, &size) == B_OK)
source = kApplicationIcon;
}
}
if (source == kNoIcon) {
// check super type for an icon
BMimeType superType;
if (type.GetSupertype(&superType) == B_OK) {
if (superType.GetIcon(&data, &size) == B_OK)
source = kSupertypeIcon;
else {
// check the super type's preferred app
char preferred[B_MIME_TYPE_LENGTH];
if (superType.GetPreferredApp(preferred) == B_OK) {
BMimeType preferredApp(preferred);
if (preferredApp.GetIconForType(superType.Type(),
&data, &size) == B_OK)
source = kSupertypeIcon;
}
}
}
}
if (source != kNoIcon) {
*_data = data;
*_size = size;
}
if (_source)
*_source = source;
return source != kNoIcon ? B_OK : B_ERROR;
}
#endif
status_t
icon_for_type(BMimeType& type, BBitmap& bitmap, icon_size size,
icon_source* _source)
@@ -992,14 +1052,26 @@ IconView::_SetIcon(entry_ref* ref)
if (info.GetType(type) != B_OK)
return;
// TODO: vector icon support!
BMimeType mimeType(type);
if (large != NULL && icon_for_type(mimeType, *large, B_LARGE_ICON) == B_OK)
hasLarge = true;
if (mini != NULL && icon_for_type(mimeType, *mini, B_MINI_ICON) == B_OK)
hasMini = true;
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
if (icon_for_type(mimeType, &data, &size) != B_OK) {
// only try large/mini icons when there is no vector icon
#endif
if (large != NULL && icon_for_type(mimeType, *large, B_LARGE_ICON) == B_OK)
hasLarge = true;
if (mini != NULL && icon_for_type(mimeType, *mini, B_MINI_ICON) == B_OK)
hasMini = true;
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
}
#endif
}
#ifdef HAIKU_TARGET_PLATFORM_HAIKU
if (data != NULL) {
_SetIcon(NULL, NULL, data, size);
free(data);
} else
#endif
if (hasLarge || hasMini)
_SetIcon(large, mini, NULL, 0);
src/preferences/filetypes/IconView.h
+2
View File
@@ -124,6 +124,8 @@ enum icon_source {
kSupertypeIcon
};
extern status_t icon_for_type(BMimeType& type, uint8** _data, size_t* _size,
icon_source* _source = NULL);
extern status_t icon_for_type(BMimeType& type, BBitmap& bitmap,
icon_size size, icon_source* _source = NULL);