Mirrors/gBar
1
0
Fork 0
mirror of https://github.com/scorpion-26/gBar.git synced 2024-11-22 03:02:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor (S)CSS loading

Browse source
This commit is contained in:
scorpion-26 2024-04-14 17:29:46 +02:00
parent 9cac3ab67a
commit ddee5aa1ad
1 changed files with 61 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
src/CSS.cpp
View file

@ -11,6 +11,59 @@ namespace CSS
{ {
static GtkCssProvider* sProvider; static GtkCssProvider* sProvider;
bool CompileAndLoadSCSS(const std::string& scssFile)
{
if (!std::ifstream(scssFile).is_open())
{
LOG("Warning: Couldn't open " << scssFile);
return false;
}
LOG("Info: Compiling " << scssFile);
Sass_File_Context* ctx = sass_make_file_context(scssFile.c_str());
Sass_Context* ctxout = sass_file_context_get_context(ctx);
sass_compile_file_context(ctx);
if (sass_context_get_error_status(ctxout))
{
LOG("Error compiling SCSS: " << sass_context_get_error_message(ctxout));
return false;
}
std::string data = sass_context_get_output_string(ctxout);
GError* err = nullptr;
gtk_css_provider_load_from_data(sProvider, data.c_str(), data.length(), &err);
if (err != nullptr)
{
LOG("Error loading compiled SCSS: " << err->message);
g_error_free(err);
err = nullptr;
return false;
}
sass_delete_file_context(ctx);
return true;
}
bool LoadCSS(const std::string& cssFile)
{
if (!std::ifstream(cssFile).is_open())
{
LOG("Warning: Couldn't open " << cssFile);
return false;
}
LOG("Info: Loading " << cssFile);
GError* err = nullptr;
gtk_css_provider_load_from_path(sProvider, cssFile.c_str(), &err);
if (err != nullptr)
{
LOG("Error loading CSS: " << err->message);
g_error_free(err);
return false;
}
return true;
}
void Load(const std::string& overrideConfigLocation) void Load(const std::string& overrideConfigLocation)
{ {
sProvider = gtk_css_provider_new(); sProvider = gtk_css_provider_new();
@ -57,56 +110,23 @@ namespace CSS
locations.push_back("/usr/share/gBar"); locations.push_back("/usr/share/gBar");
} }
GError* err = nullptr;
for (auto& dir : locations) for (auto& dir : locations)
{ {
std::string file = dir + "/style.scss"; if (CompileAndLoadSCSS(dir + "/style.scss"))
bool scss_suceeded = false;
if (std::ifstream(file).is_open())
{ {
Sass_File_Context* ctx = sass_make_file_context(file.c_str()); LOG("SCSS found and loaded successfully!");
Sass_Context* ctxout = sass_file_context_get_context(ctx); return;
sass_compile_file_context(ctx);
if(sass_context_get_error_status(ctxout))
{
LOG("Error Compiling SCSS: " << sass_context_get_error_message(ctxout));
} }
else else
{ {
std::string data = sass_context_get_output_string(ctxout); LOG("Warning: Failed loading SCSS, falling back to CSS!");
gtk_css_provider_load_from_data(sProvider, data.c_str(), data.length(), &err);
scss_suceeded = true;
}
sass_delete_file_context(ctx);
} }
if (!scss_suceeded) if (LoadCSS(dir + "/style.css"))
{
LOG("Info: couldn't load SCSS from " << dir);
file = dir + "/style.css";
if (!std::ifstream(file).is_open())
{
LOG("Info: No CSS found in " << dir);
continue;
}
gtk_css_provider_load_from_path(sProvider, file.c_str(), &err);
}
if (!err)
{ {
LOG("CSS found and loaded successfully!"); LOG("CSS found and loaded successfully!");
return; return;
} }
LOG("Warning: Failed loading config for " << dir << ", trying next one!");
// Log any errors
LOG(err->message);
g_error_free(err);
} }
ASSERT(false, "No CSS file found!"); ASSERT(false, "No CSS file found!");
} }