Fix superitems not updating correctly

DirectoryData.cpp, DirectoryData.hpp
~ percentOfParent is const

FolderDisplay.hpp
~ UpdateTitle is now public

FolderDisplay.cpp
~ fix race condition by scheduling main UI event after reconnection
~ update parent item's subfolders slot in addition to size

interface_derived.h
~ recalculate stats in ProgressUpdate
~ update all titles in current display

Author: Ravbug

source/DirectoryData.cpp

@@ -80,7 +80,7 @@ vector<DirectoryData*> DirectoryData::getSuperFolders(){
 Return a string representing the item's % size of the superitem
 @returns size rounded to 1 decimal place e.g (5.2%)
 */
-long double DirectoryData::percentOfParent(){
+long double DirectoryData::percentOfParent() const{
 //	if (parent == nullptr){return "[waiting]";}
 //	//round to 2 decimal places, then attach unit
 //	char buffer[10];

source/DirectoryData.hpp

@@ -45,5 +45,5 @@ class DirectoryData{
 	void resetStats();
 	void recalculateStats();
 	vector<DirectoryData*> getSuperFolders();
-	long double percentOfParent();
+	long double percentOfParent() const;
 };

source/FolderDisplay.cpp

@@ -267,15 +267,6 @@ void FolderDisplay::Size(FolderDisplay* parent, wxDataViewItem updateItem){
 			//invoke event to notify needs to update UI
 			wxPostEvent(this, event);
 
-			//invoke main UI event
-			//notify parent to connect new pointer to display
-			
-			wxCommandEvent* evt = new wxCommandEvent(progEvt, RESEVT);
-			//pass along the address to the DirectoryData to the event
-			uintptr_t* addr = new uintptr_t(prog * 100);
-			evt->SetClientData(addr);
-			eventManager->GetEventHandler()->QueueEvent(evt);
-			
 		};
 		//called on progress updates
 		SizeItem(data->Path, uicallback);
@@ -299,8 +290,26 @@ void FolderDisplay::OnUpdateUI(wxCommandEvent& event){
 	//add files once
 	if (prog == 100){
 		auto old_parent = data->parent;
-		data = fd;
+		//update size in parent
+		if (old_parent != nullptr){
+			old_parent->size -= data->size;
+			data = fd;
+			old_parent->size += data->size;
+			
+			//reconnect item in SubFolders of parent
+			for(int i = 0; i < old_parent->subFolders.size(); i++){
+				DirectoryData* parentItem = old_parent->subFolders[i];
+				if (parentItem->Path == data->Path){
+					old_parent->subFolders[i] = data;
+					break;
+				}
+			}
+		}
+		else{
+			data = fd;
+		}
 		data->parent = old_parent;
+		
 		UpdateTitle(false);
 		//update percents
 		auto count = data->subFolders.size();
@@ -323,4 +332,13 @@ void FolderDisplay::OnUpdateUI(wxCommandEvent& event){
 		//set sort descending
 		ListCtrl->GetColumn(1)->SetSortOrder(false);
 	}
+	
+	//invoke main UI event
+	//notify parent to connect new pointer to display
+	
+	wxCommandEvent* evt = new wxCommandEvent(progEvt, RESEVT);
+	//pass along the address to the DirectoryData to the event
+	uintptr_t* addr = new uintptr_t(prog);
+	evt->SetClientData(addr);
+	eventManager->GetEventHandler()->QueueEvent(evt);
 }

source/FolderDisplay.hpp

@@ -49,6 +49,16 @@ class FolderDisplay : public FolderDisplayBase{
 	void display();
 	static string sizeToString(const fileSize&);
 	bool abort = true;
+	
+	/**
+	 Sets the label in this display to the size of the item
+	 @param isSizing pass true if the size operation is in progress, false otherwise
+	 @note If the size of the current DirectoryData is 0, the item's size will display as Needs reload because the minimum size FatFileFinder reports is 1 byte.
+	 */
+	void UpdateTitle(bool isSizing = false){
+		ItemName->SetLabel((isSizing? "(Sizing) " : "") + std::filesystem::path(data->Path).filename().string() + " - " + (data->size == 0? "Needs reload" : sizeToString(data->size)));
+	}
+	
 private:
 	wxWindow* eventManager = nullptr;
 	std::thread worker;
@@ -77,15 +87,6 @@ class FolderDisplay : public FolderDisplayBase{
 	void OnSelectionActivated(wxDataViewEvent&);
 	void OnUpdateUI(wxCommandEvent&);
 
-	
-	/**
-	 Sets the label in this display to the size of the item
-	 @param isSizing pass true if the size operation is in progress, false otherwise
-	 @note If the size of the current DirectoryData is 0, the item's size will display as Needs reload because the minimum size FatFileFinder reports is 1 byte.
-	 */
-	void UpdateTitle(bool isSizing = false){
-		ItemName->SetLabel((isSizing? "(Sizing) " : "") + std::filesystem::path(data->Path).filename().string() + " - " + (data->size == 0? "Needs reload" : sizeToString(data->size)));
-	}
 	wxDECLARE_EVENT_TABLE();
 
 public:

source/interface_derived.h

@@ -45,6 +45,12 @@ class MainFrame : public MainFrameBase
 
 	void ProgressUpdate(int progress){
 		progressBar->SetValue(progress);
+		if (progress == 100){
+			currentDisplay[0]->data->recalculateStats();
+			for (FolderDisplay* disp : currentDisplay){
+				disp->UpdateTitle();
+			}
+		}
 		UpdateTitlebar(progress, FolderDisplay::sizeToString(currentDisplay[0]->data->size));
 	}