From b67eae722857f6f9e69f99e46dc8b6c83dad6a1c Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Fri, 6 May 2022 14:30:35 +0200 Subject: [PATCH] fix kb stuff --- src/config/ConfigManager.cpp | 15 ++++++++++----- src/config/ConfigManager.hpp | 2 ++ src/render/OpenGL.cpp | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index e4714b74..ad8da9ae 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -58,10 +58,10 @@ void CConfigManager::setDefaultVars() { configValues["animations:fadein"].intValue = 1; configValues["input:kb_layout"].strValue = "en"; - configValues["input:kb_variant"].strValue = ""; - configValues["input:kb_options"].strValue = ""; - configValues["input:kb_rules"].strValue = ""; - configValues["input:kb_model"].strValue = ""; + configValues["input:kb_variant"].strValue = STRVAL_EMPTY; + configValues["input:kb_options"].strValue = STRVAL_EMPTY; + configValues["input:kb_rules"].strValue = STRVAL_EMPTY; + configValues["input:kb_model"].strValue = STRVAL_EMPTY; configValues["input:repeat_rate"].intValue = 25; configValues["input:repeat_delay"].intValue = 600; configValues["input:touchpad:disable_while_typing"].intValue = 1; @@ -579,7 +579,12 @@ float CConfigManager::getFloat(std::string v) { } std::string CConfigManager::getString(std::string v) { - return getConfigValueSafe(v).strValue; + const auto VAL = getConfigValueSafe(v).strValue; + + if (VAL == STRVAL_EMPTY) + return ""; + + return VAL; } void CConfigManager::setInt(std::string v, int val) { diff --git a/src/config/ConfigManager.hpp b/src/config/ConfigManager.hpp index b8136016..3c2cd38e 100644 --- a/src/config/ConfigManager.hpp +++ b/src/config/ConfigManager.hpp @@ -14,6 +14,8 @@ #include "defaultConfig.hpp" +#define STRVAL_EMPTY "[[EMPTY]]" + struct SConfigValue { int64_t intValue = -1; float floatValue = -1; diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp index 6109d2c6..6063b484 100644 --- a/src/render/OpenGL.cpp +++ b/src/render/OpenGL.cpp @@ -371,7 +371,7 @@ CFramebuffer* CHyprOpenGLImpl::blurMainFramebufferWithDamage(float a, wlr_box* p const auto BLURSIZE = g_pConfigManager->getInt("decoration:blur_size"); const auto BLURPASSES = g_pConfigManager->getInt("decoration:blur_passes"); - const auto BLURRADIUS = BLURSIZE * BLURPASSES; + const auto BLURRADIUS = BLURSIZE * BLURPASSES * BLURPASSES; // now, prep the damage, get the extended damage region pixman_region32_t damage;