Commit 4d6f4f55 authored by jan.koester's avatar jan.koester
Browse files

test

parent 7a1c5823
Loading
Loading
Loading
Loading
+60 −3
Changes for src/theme.cpp: 60 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -637,6 +637,42 @@ void blogi::Theme::injectThemeColors(const int tid, libhtmlpp::HtmlElement *inde
    if(!head)
        return;

    std::string styleCss;
    for(const auto& file : _PublicFiles){
        if(file.Path == "/theme/public/style.css"){
            styleCss = file.Content;
            break;
        }
    }

    auto extractCssVar = [](const std::string &css, const std::string &varName) -> std::string {
        std::string search = varName;
        size_t pos = css.find(search);
        while (pos != std::string::npos) {
            size_t colon = css.find(':', pos);
            if (colon != std::string::npos) {
                // simple check to ensure we matched a variable declaration and not a usage var(--xy)
                bool isDecl = true;
                for (size_t i = pos + search.length(); i < colon; ++i) {
                    if (!std::isspace(css[i])) { isDecl = false; break; }
                }
                if (isDecl && pos > 0 && (std::isspace(css[pos-1]) || css[pos-1] == '{' || css[pos-1] == ';')) {
                    size_t start = colon + 1;
                    while (start < css.length() && std::isspace(css[start])) ++start;
                    size_t end = css.find(';', start);
                    if (end == std::string::npos) end = css.find('}', start);
                    if (end != std::string::npos) {
                        std::string val = css.substr(start, end - start);
                        while(!val.empty() && std::isspace(val.back())) val.pop_back();
                        return val;
                    }
                }
            }
            pos = css.find(search, pos + search.length());
        }
        return "";
    };

    struct ColorVar { const char *dbSuffix; const char *cssVar; const char *darkDefault; const char *lightDefault; };
    ColorVar vars[] = {
        {"BG",           "--blogi-bg",            "#232627",  "rgba(235,237,240,1)"},
@@ -666,10 +702,17 @@ void blogi::Theme::injectThemeColors(const int tid, libhtmlpp::HtmlElement *inde
    // Dark scheme (default)
    css << ":root{";
    for(auto &v : vars){
        std::string dynamicDef = extractCssVar(styleCss, v.cssVar);
        if(dynamicDef.empty() && std::string(v.cssVar).find("--blogi-") == 0) {
            std::string altVar = "--color-" + std::string(v.cssVar).substr(8);
            dynamicDef = extractCssVar(styleCss, altVar);
        }
        std::string ddef = dynamicDef.empty() ? v.darkDefault : dynamicDef;

        std::string val;
        try { getConfig(*_Config.TDatabase[tid], darkPrefix + v.dbSuffix, val); } catch(...) {}
        normalizeColor(val);
        if(val.empty()) val = v.darkDefault;
        if(val.empty()) val = ddef;
        css << v.cssVar << ":" << val.c_str() << ";";
    }
    css << "color-scheme:dark;}";
@@ -678,10 +721,17 @@ void blogi::Theme::injectThemeColors(const int tid, libhtmlpp::HtmlElement *inde
    std::string lightPrefix = "THEME_LIGHT_";
    css << ":root[data-theme=\"light\"]{";
    for(auto &v : vars){
        std::string dynamicDef = extractCssVar(styleCss, v.cssVar);
        if(dynamicDef.empty() && std::string(v.cssVar).find("--blogi-") == 0) {
            std::string altVar = "--color-" + std::string(v.cssVar).substr(8);
            dynamicDef = extractCssVar(styleCss, altVar);
        }
        std::string ldef = dynamicDef.empty() ? v.lightDefault : dynamicDef;

        std::string val;
        try { getConfig(*_Config.TDatabase[tid], lightPrefix + v.dbSuffix, val); } catch(...) {}
        normalizeColor(val);
        if(val.empty()) val = v.lightDefault;
        if(val.empty()) val = ldef;
        css << v.cssVar << ":" << val.c_str() << ";";
    }
    css << "color-scheme:light;}";
@@ -689,10 +739,17 @@ void blogi::Theme::injectThemeColors(const int tid, libhtmlpp::HtmlElement *inde
    // Light scheme — OS preference (auto mode)
    css << "@media(prefers-color-scheme:light){:root:not([data-theme=\"dark\"]){";
    for(auto &v : vars){
        std::string dynamicDef = extractCssVar(styleCss, v.cssVar);
        if(dynamicDef.empty() && std::string(v.cssVar).find("--blogi-") == 0) {
            std::string altVar = "--color-" + std::string(v.cssVar).substr(8);
            dynamicDef = extractCssVar(styleCss, altVar);
        }
        std::string ldef = dynamicDef.empty() ? v.lightDefault : dynamicDef;

        std::string val;
        try { getConfig(*_Config.TDatabase[tid], lightPrefix + v.dbSuffix, val); } catch(...) {}
        normalizeColor(val);
        if(val.empty()) val = v.lightDefault;
        if(val.empty()) val = ldef;
        css << v.cssVar << ":" << val.c_str() << ";";
    }
    css << "color-scheme:light;}}";