diff --git a/loader/include/Geode/c++stl/gdstdlib.hpp b/loader/include/Geode/c++stl/gdstdlib.hpp index d928bf89..5fcaa2c6 100644 --- a/loader/include/Geode/c++stl/gdstdlib.hpp +++ b/loader/include/Geode/c++stl/gdstdlib.hpp @@ -2,7 +2,7 @@ #include -#include "string-base.hpp" +#include "string.hpp" #if defined(GEODE_IS_WINDOWS) #include "msvcstl.hpp" diff --git a/loader/include/Geode/c++stl/string-base.hpp b/loader/include/Geode/c++stl/string.hpp similarity index 100% rename from loader/include/Geode/c++stl/string-base.hpp rename to loader/include/Geode/c++stl/string.hpp diff --git a/loader/src/c++stl/string-adapter.hpp b/loader/src/c++stl/string-impl.hpp similarity index 100% rename from loader/src/c++stl/string-adapter.hpp rename to loader/src/c++stl/string-impl.hpp diff --git a/loader/src/c++stl/string.cpp b/loader/src/c++stl/string.cpp index e2770c2e..49009293 100644 --- a/loader/src/c++stl/string.cpp +++ b/loader/src/c++stl/string.cpp @@ -1,5 +1,5 @@ #include -#include "string-adapter.hpp" +#include "string-impl.hpp" #include #include #include diff --git a/loader/src/platform/android/gdstdlib.cpp b/loader/src/platform/android/gdstdlib.cpp index 7a3fc0c6..cb194354 100644 --- a/loader/src/platform/android/gdstdlib.cpp +++ b/loader/src/platform/android/gdstdlib.cpp @@ -1,5 +1,5 @@ #include -#include "../../c++stl/string-adapter.hpp" +#include "../../c++stl/string-impl.hpp" #ifdef GEODE_IS_ANDROID diff --git a/loader/src/platform/windows/gdstdlib.cpp b/loader/src/platform/windows/gdstdlib.cpp index f1b2b951..71296672 100644 --- a/loader/src/platform/windows/gdstdlib.cpp +++ b/loader/src/platform/windows/gdstdlib.cpp @@ -1,4 +1,4 @@ -#include "../../c++stl/string-adapter.hpp" +#include "../../c++stl/string-impl.hpp" #ifdef GEODE_IS_WINDOWS diff --git a/loader/src/ui/internal/list/ModListLayer.cpp b/loader/src/ui/internal/list/ModListLayer.cpp index cadd9188..edb1b377 100644 --- a/loader/src/ui/internal/list/ModListLayer.cpp +++ b/loader/src/ui/internal/list/ModListLayer.cpp @@ -238,6 +238,13 @@ CCArray* ModListLayer::createModCells(ModListType type, ModListQuery const& quer bool ModListLayer::init() { if (!CCLayer::init()) return false; + { + gd::string hi = "hello"; + gd::string hi2 = "hello"; + gd::string hi3 = "hella"; + log::info("{} {} {} {}", hi == hi2, hi == hi3, hi < hi3, hi > hi3); + } + m_indexListener.bind(this, &ModListLayer::onIndexUpdate); auto winSize = CCDirector::sharedDirector()->getWinSize(); @@ -504,6 +511,7 @@ void ModListLayer::reloadList(bool keepScroll, std::optional const m_listLabel->setVisible(true); m_listLabel->setString("Updating index..."); if (!m_loadingCircle) { + // TODO: mat m_loadingCircle = LoadingCircle::create(); m_loadingCircle->setPosition(.0f, -40.f);