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

FileTypes : IconView for non-applications fixes

Browse Source 
IconView is now only setting the icon with BAppFileInfo when the file is an application,
otherwise relies on BNodeInfo. This avoids adding ressources within data files.

The IconView also wasn't populated correctly when used on data files (by opposition to
application binaries).  It now loads the same icon that is shown in Tracker.
This commit is contained in:
Philippe Saint-Pierre
2012-08-25 15:06:58 -04:00
parent 66ddd2d6e9
commit a70b623a51
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/filetypes/IconView.cpp
+23 -11
View File
@@ -4,6 +4,7 @@
*/
#include "FileTypes.h"
#include "IconView.h"
#include "MimeTypeListView.h"
@@ -1026,12 +1027,12 @@ IconView::Update()
if (file.InitCheck() != B_OK)
return;
BAppFileInfo info;
BNodeInfo info;
if (info.SetTo(&file) != B_OK)
return;
icon = Icon::AllocateBitmap(fIconSize);
if (icon != NULL && info.GetIconForType(fType.Type(), icon,
if (icon != NULL && info.GetTrackerIcon(icon,
(icon_size)fIconSize) != B_OK) {
delete icon;
return;
@@ -1234,15 +1235,26 @@ IconView::_SetIcon(BBitmap* large, BBitmap* mini, const uint8* data,
if (fHasRef) {
BFile file(&fRef, B_READ_WRITE);
BAppFileInfo info(&file);
info.SetInfoLocation(B_USE_ATTRIBUTES);
if (info.InitCheck() == B_OK) {
if (large != NULL || force)
info.SetIconForType(fType.Type(), large, B_LARGE_ICON);
if (mini != NULL || force)
info.SetIconForType(fType.Type(), mini, B_MINI_ICON);
if (data != NULL || force)
info.SetIconForType(fType.Type(), data, size);
if (is_application(file)) {
BAppFileInfo info(&file);
if (info.InitCheck() == B_OK) {
if (large != NULL || force)
info.SetIconForType(fType.Type(), large, B_LARGE_ICON);
if (mini != NULL || force)
info.SetIconForType(fType.Type(), mini, B_MINI_ICON);
if (data != NULL || force)
info.SetIconForType(fType.Type(), data, size);
}
} else {
BNodeInfo info(&file);
if (info.InitCheck() == B_OK) {
if (large != NULL || force)
info.SetIcon(large, B_LARGE_ICON);
if (mini != NULL || force)
info.SetIcon(mini, B_MINI_ICON);
if (data != NULL || force)
info.SetIcon(data, size);
}
}
// the icon shown will be updated using node monitoring
} else if (fHasType) {