github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: FileSel icons in X11 fixed

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@2892 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2010-12-05 14:09:44 +00:00
parent b295a996f9
commit b9bf8df0f8
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
uppsrc/CtrlLib/FileSel.cpp
View file

@ -171,7 +171,7 @@ struct FileExtMaker : ImageMaker {
String minor;
if(!Single<ExtToMime>().GetMime(ext, major, minor))
return Null;
Image img = GnomeImage("mime-" + major + '-' + minor, large ? 48 : 16);
Image img = GnomeImage("mime-" + major + '-' + minor, large);
return IsNull(img) ? GnomeImage("mime-" + major) : img;
}
};
@ -327,8 +327,7 @@ bool Load(FileList& list, const String& dir, const char *patterns, bool dirs,
MatchSearch(fi.filename, search) && show) {
#ifdef PLATFORM_X11
Image img = isdrive ? PosixGetDriveImage(fi.filename, false)
: lazyicons ? fi.is_directory ? CtrlImg::Dir() : CtrlImg::File()
: GetFileIcon(dir, fi.filename, fi.is_directory, fi.unix_mode & 0111, false);
: GetFileIcon(dir, fi.filename, fi.is_directory, fi.unix_mode & 0111, false);
#else
// Image img = lazyicons ? fi.is_directory ? CtrlImg::Dir() : CtrlImg::File()
// : GetFileIcon(AppendFileName(dir, fi.filename), fi.is_directory, fi.unix_mode & 0111, false);
@ -569,7 +568,9 @@ void FileSel::SearchLoad()
SearchLoad();
}
#ifdef PLATFORM_WIN32
lazyicons.Start(list, d, WhenIcon);
#endif
places.KillCursor();
if(d.GetCount())
places.FindSetCursor(d);