mirror of
https://github.com/aseprite/aseprite.git
synced 2024-12-26 18:21:44 +00:00
Win32: Show filename with extension instead of display name for files.
If the user has the "hide extensions for known file types" option selected in Windows Explorer, the display name will not contain the file extension, so it's better to use the filename (with extension) directly.
This commit is contained in:
parent
420a46f689
commit
7d1df59370
@ -756,21 +756,23 @@ static void update_by_pidl(FileItem* fileitem)
|
||||
/****************************************/
|
||||
/* get the name to display */
|
||||
|
||||
if (pFolder &&
|
||||
if (fileitem->isFolder() &&
|
||||
pFolder &&
|
||||
pFolder->GetDisplayNameOf(fileitem->pidl,
|
||||
SHGDN_INFOLDER,
|
||||
&strret) == S_OK) {
|
||||
StrRetToBuf(&strret, fileitem->pidl, pszName, MAX_PATH);
|
||||
fileitem->displayname = pszName;
|
||||
}
|
||||
else if (shl_idesktop->GetDisplayNameOf(fileitem->fullpidl,
|
||||
else if (fileitem->isFolder() &&
|
||||
shl_idesktop->GetDisplayNameOf(fileitem->fullpidl,
|
||||
SHGDN_INFOLDER,
|
||||
&strret) == S_OK) {
|
||||
StrRetToBuf(&strret, fileitem->fullpidl, pszName, MAX_PATH);
|
||||
fileitem->displayname = pszName;
|
||||
}
|
||||
else {
|
||||
fileitem->displayname = "ERR";
|
||||
fileitem->displayname = base::get_file_name(fileitem->filename);
|
||||
}
|
||||
|
||||
if (pFolder != NULL && pFolder != shl_idesktop) {
|
||||
@ -951,10 +953,9 @@ static FileItem* get_fileitem_by_fullpidl(LPITEMIDLIST fullpidl, bool create_if_
|
||||
fileitem->fullpidl = clone_pidl(fullpidl);
|
||||
|
||||
fileitem->attrib = SFGAO_FOLDER;
|
||||
shl_idesktop->GetAttributesOf(1, (LPCITEMIDLIST *)&fileitem->fullpidl,
|
||||
&fileitem->attrib);
|
||||
|
||||
{
|
||||
HRESULT hr = shl_idesktop->GetAttributesOf(1, (LPCITEMIDLIST *)&fileitem->fullpidl,
|
||||
&fileitem->attrib);
|
||||
if (hr == S_OK) {
|
||||
LPITEMIDLIST parent_fullpidl = clone_pidl(fileitem->fullpidl);
|
||||
remove_last_pidl(parent_fullpidl);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user