hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-02 19:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix kb stuff

Browse source
This commit is contained in:
vaxerski 2022-05-06 14:30:35 +02:00
parent 9ddfe0b4ae
commit b67eae7228
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/config/ConfigManager.cpp
View file

@ -58,10 +58,10 @@ void CConfigManager::setDefaultVars() {
configValues["animations:fadein"].intValue = 1; configValues["animations:fadein"].intValue = 1;
configValues["input:kb_layout"].strValue = "en"; configValues["input:kb_layout"].strValue = "en";
configValues["input:kb_variant"].strValue = ""; configValues["input:kb_variant"].strValue = STRVAL_EMPTY;
configValues["input:kb_options"].strValue = ""; configValues["input:kb_options"].strValue = STRVAL_EMPTY;
configValues["input:kb_rules"].strValue = ""; configValues["input:kb_rules"].strValue = STRVAL_EMPTY;
configValues["input:kb_model"].strValue = ""; configValues["input:kb_model"].strValue = STRVAL_EMPTY;
configValues["input:repeat_rate"].intValue = 25; configValues["input:repeat_rate"].intValue = 25;
configValues["input:repeat_delay"].intValue = 600; configValues["input:repeat_delay"].intValue = 600;
configValues["input:touchpad:disable_while_typing"].intValue = 1; 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) { 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) { void CConfigManager::setInt(std::string v, int val) {

2
src/config/ConfigManager.hpp
View file

@ -14,6 +14,8 @@
#include "defaultConfig.hpp" #include "defaultConfig.hpp"
#define STRVAL_EMPTY "[[EMPTY]]"
struct SConfigValue { struct SConfigValue {
int64_t intValue = -1; int64_t intValue = -1;
float floatValue = -1; float floatValue = -1;

2
src/render/OpenGL.cpp
View file

@ -371,7 +371,7 @@ CFramebuffer* CHyprOpenGLImpl::blurMainFramebufferWithDamage(float a, wlr_box* p
const auto BLURSIZE = g_pConfigManager->getInt("decoration:blur_size"); const auto BLURSIZE = g_pConfigManager->getInt("decoration:blur_size");
const auto BLURPASSES = g_pConfigManager->getInt("decoration:blur_passes"); 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 // now, prep the damage, get the extended damage region
pixman_region32_t damage; pixman_region32_t damage;