From 6ccd8853db5e83b324664d1aec721c7e3a2a74d3 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Sat, 19 Sep 2020 21:54:15 +0300 Subject: [PATCH 1/4] Fixed: setActive() did not invalidate table cell size. --- code/nel/src/gui/interface_element.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/nel/src/gui/interface_element.cpp b/code/nel/src/gui/interface_element.cpp index cf5646077..4a736314d 100644 --- a/code/nel/src/gui/interface_element.cpp +++ b/code/nel/src/gui/interface_element.cpp @@ -1168,6 +1168,8 @@ namespace NLGUI { _Active = state; invalidateCoords(); + // force invalidate CViewText/CGroupTable inner elements + invalidateContent(); } } From ae91cc4179f9c988cdc939e1bbe7d796c56bc873 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Sat, 17 Oct 2020 12:35:10 +0300 Subject: [PATCH 2/4] Fixed: Ingame map search and search result tooltips for UTF8 strings --- code/ryzom/client/src/interface_v3/group_map.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/ryzom/client/src/interface_v3/group_map.cpp b/code/ryzom/client/src/interface_v3/group_map.cpp index dd5e5ae20..a7f326220 100644 --- a/code/ryzom/client/src/interface_v3/group_map.cpp +++ b/code/ryzom/client/src/interface_v3/group_map.cpp @@ -2472,7 +2472,8 @@ void CGroupMap::updateMatchedLandmarks() std::vector > params; params.clear(); params.push_back(std::pair("id", toString("lm%d", k))); - params.push_back(std::pair("tooltip", _MatchedLandmarks[k].Title.toUtf8())); + // ctrl base expects utf8 string to start with "u:" + params.push_back(std::pair("tooltip", "u:" + _MatchedLandmarks[k].Title.toUtf8())); params.push_back(std::pair("index", toString(k))); CInterfaceGroup *g = CWidgetManager::getInstance()->getParser()->createGroupInstance("lm_search_result", pL->getId(), params); @@ -2680,7 +2681,7 @@ void CGroupMap::setLandmarkFilter(const std::string &s) if (!s.empty()) { ucstring ucs; ucs.fromUtf8(s); - splitUCString(toLower(s), ucstring(" "), _LandmarkFilter); + splitUCString(toLower(ucs), ucstring(" "), _LandmarkFilter); } // recreate landmarks From 9f3250f4db11e875ea1210599da5cda8c082ce9d Mon Sep 17 00:00:00 2001 From: Nimetu Date: Tue, 10 Nov 2020 17:46:06 +0200 Subject: [PATCH 3/4] Fixed: patching single file with multiple version in a row. --- code/ryzom/client/src/login_patch.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index 0a6b912dd..d087a847d 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -2967,7 +2967,7 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP) PatchSizeProgress += rFTP.PatcheSizes[j]; currentPatchedSize += rFTP.PatcheSizes[j]; } - + } if (tmpSourceName != DestinationName) { pPM->deleteFile(SourceName, false, false); // File can exists if bad BNP loading @@ -2981,7 +2981,6 @@ void CPatchThread::processFile (CPatchManager::SFileToPatch &rFTP) pPM->renameFile(tmpSourceName, DestinationName); } } - } } else { From 762962ef25963f3f1dae3ea2eb0b1a1af4c68af8 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Tue, 10 Nov 2020 23:40:04 +0200 Subject: [PATCH 4/4] Fixed: Only download own platform exedll_.ref files --- code/ryzom/client/src/login_patch.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/ryzom/client/src/login_patch.cpp b/code/ryzom/client/src/login_patch.cpp index d087a847d..f21d84bb7 100644 --- a/code/ryzom/client/src/login_patch.cpp +++ b/code/ryzom/client/src/login_patch.cpp @@ -1280,6 +1280,19 @@ void CPatchManager::readDescFile(sint32 nVersion) CBNPFileSet &bnpFS = const_cast(DescFile.getFiles()); + // TODO: .ref files are expected to follow platform category naming (they are in 'main' category) + std::set::const_iterator it; + for(it = forceRemovePatchCategories.begin(); it != forceRemovePatchCategories.end(); ++it) + { + std::string name = *it; + std::string::size_type pos = name.find("_"); + if (pos != std::string::npos) + { + name = name.substr(pos+1) + "_.ref"; + bnpFS.removeFile(name); + } + } + for (cat = 0; cat < DescFile.getCategories().categoryCount();) { const CBNPCategory &bnpCat = DescFile.getCategories().getCategory(cat);