added primary and secondary font colors

This commit is contained in:
vaxerski 2022-11-16 17:33:45 +00:00
parent f3d0904249
commit 26bef3aa41
2 changed files with 3 additions and 1 deletions

View file

@ -551,7 +551,7 @@ int CStatusBar::drawWorkspacesModule(SBarModule* mod, int off) {
drawCairoRectangle(Vector2D(off + m_vecSize.y * drawnWorkspaces, 0), Vector2D(m_vecSize.y, m_vecSize.y), WORKSPACE == MOUSEWORKSPACEID ? ConfigManager::getInt("bar:col.high") : ConfigManager::getInt("bar:col.bg")); drawCairoRectangle(Vector2D(off + m_vecSize.y * drawnWorkspaces, 0), Vector2D(m_vecSize.y, m_vecSize.y), WORKSPACE == MOUSEWORKSPACEID ? ConfigManager::getInt("bar:col.high") : ConfigManager::getInt("bar:col.bg"));
drawText(Vector2D(off + m_vecSize.y * drawnWorkspaces + m_vecSize.y / 2.f - getTextWidth(workspaceName, ConfigManager::getString("bar:font.main"), ConfigManager::getFloat("bar:font.size")) / 2.f, getTextHalfY()), drawText(Vector2D(off + m_vecSize.y * drawnWorkspaces + m_vecSize.y / 2.f - getTextWidth(workspaceName, ConfigManager::getString("bar:font.main"), ConfigManager::getFloat("bar:font.size")) / 2.f, getTextHalfY()),
workspaceName, WORKSPACE == MOUSEWORKSPACEID ? 0xFF111111 : 0xFFFFFFFF, ConfigManager::getString("bar:font.main"), ConfigManager::getFloat("bar:font.size")); workspaceName, WORKSPACE == MOUSEWORKSPACEID ? ConfigManager::getInt("bar:col.font_secondary") : ConfigManager::getInt("bar:col.font_main"), ConfigManager::getString("bar:font.main"), ConfigManager::getFloat("bar:font.size"));
drawnWorkspaces++; drawnWorkspaces++;
} }

View file

@ -34,6 +34,8 @@ void ConfigManager::init() {
configValues["bar:height"].intValue = 15; configValues["bar:height"].intValue = 15;
configValues["bar:col.bg"].intValue = 0xFF111111; configValues["bar:col.bg"].intValue = 0xFF111111;
configValues["bar:col.high"].intValue = 0xFFFF3333; configValues["bar:col.high"].intValue = 0xFFFF3333;
configValues["bar:col.font_main"].intValue = 0xFFFFFFFF;
configValues["bar:col.font_secondary"].intValue = 0xFF111111;
configValues["bar:font.size"].floatValue = 12; configValues["bar:font.size"].floatValue = 12;
configValues["bar:font.main"].strValue = "Noto Sans"; configValues["bar:font.main"].strValue = "Noto Sans";
configValues["bar:font.secondary"].strValue = "Noto Sans"; configValues["bar:font.secondary"].strValue = "Noto Sans";