summaryrefslogtreecommitdiff
path: root/ui/tree_view.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:19:49 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:19:49 +0200
commitc8e0e909b4a8d18319fc65434a10dc446434817c (patch)
treeeee91e7d2ce229dd043811eae8f1e2bd78061916 /ui/tree_view.cpp
parent5.2 (diff)
downloadFreeFileSync-c8e0e909b4a8d18319fc65434a10dc446434817c.tar.gz
FreeFileSync-c8e0e909b4a8d18319fc65434a10dc446434817c.tar.bz2
FreeFileSync-c8e0e909b4a8d18319fc65434a10dc446434817c.zip
5.3
Diffstat (limited to 'ui/tree_view.cpp')
-rw-r--r--ui/tree_view.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/tree_view.cpp b/ui/tree_view.cpp
index 49548142..b3a9595a 100644
--- a/ui/tree_view.cpp
+++ b/ui/tree_view.cpp
@@ -23,10 +23,10 @@ inline
void TreeView::compressNode(Container& cont) //remove single-element sub-trees -> gain clarity + usability (call *after* inclusion check!!!)
{
if (cont.subDirs.empty() || //single files node or...
- (cont.firstFile == nullptr && //single dir node...
- cont.subDirs.size() == 1 && //
+ (cont.firstFile == nullptr && //single dir node...
+ cont.subDirs.size() == 1 && //
cont.subDirs[0].firstFile == nullptr && //...that is empty
- cont.subDirs[0].subDirs.empty())) //
+ cont.subDirs[0].subDirs.empty())) //
{
cont.subDirs.clear();
cont.firstFile = nullptr;
@@ -624,7 +624,7 @@ public:
fileIcon(IconBuffer(IconBuffer::SIZE_SMALL).genericFileIcon()),
dirIcon (IconBuffer(IconBuffer::SIZE_SMALL).genericDirIcon ()),
rootBmp(GlobalResources::getImage(L"rootFolder").ConvertToImage().Scale(fileIcon.GetWidth(), fileIcon.GetHeight(), wxIMAGE_QUALITY_HIGH)),
- widthNodeIcon(fileIcon.GetWidth()),
+ widthNodeIcon(dirIcon.GetWidth()),
widthLevelStep(widthNodeIcon),
widthNodeStatus(GlobalResources::getImage(L"nodeExpanded").GetWidth()),
grid_(grid),
bgstack15