mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-07-11 22:03:01 -06:00
FileSel NativeIcon issues fixed in POSIX
git-svn-id: svn://ultimatepp.org/upp/trunk@1054 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
5d7ef51b83
commit
4d14dc7168
1 changed files with 3 additions and 3 deletions
|
|
@ -314,8 +314,8 @@ bool Load(FileList& list, const String& dir, const char *patterns, bool dirs,
|
|||
(fi.is_directory || PatternMatchMulti(patterns, fi.filename)) &&
|
||||
MatchSearch(fi.filename, search) && show) {
|
||||
#ifdef PLATFORM_X11
|
||||
Image img = isdrive ? PosixGetDriveImage(fi.filename)
|
||||
: GetFileIcon(dir, fi.filename, fi.is_directory, fi.unix_mode & 0111);
|
||||
Image img = isdrive ? PosixGetDriveImage(fi.filename, false)
|
||||
: GetFileIcon(dir, fi.filename, fi.is_directory, fi.unix_mode & 0111, false);
|
||||
#else
|
||||
Image img = GetFileIcon(AppendFileName(dir, fi.filename), fi.is_directory, false, false);
|
||||
#endif
|
||||
|
|
@ -990,7 +990,7 @@ void FolderDisplay::Paint(Draw& w, const Rect& r, const Value& q,
|
|||
String s = q;
|
||||
w.DrawRect(r, paper);
|
||||
#ifdef PLATFORM_X11
|
||||
Image img = GetFileIcon(GetFileFolder(s), GetFileName(s), true, false);
|
||||
Image img = GetFileIcon(GetFileFolder(s), GetFileName(s), true, false, false);
|
||||
#else
|
||||
Image img = s.GetCount() ? GetFileIcon(s, false, true, false) : CtrlImg::Computer();
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue