RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

better logic to find valid output dimensions

pull/1358/head
Ryan Gibb 2021-12-29 11:33:53 +00:00
parent 39983c16da
commit c3e6014d68
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/config.cpp
View File

@ -142,16 +142,19 @@ bool isValidOutput(const Json::Value &config, const std::string &name,
std::string comparator = str.substr(0, i); std::string comparator = str.substr(0, i);
int value = std::stoi(str.substr(i)); int value = std::stoi(str.substr(i));
if (dimension == "height" && comparator == "<" && height >= value) { int comparison_value;
return false; if (dimension == "height") {
} else if (dimension == "height" && comparator == ">" && height <= value) { comparison_value = height;
return false; } else if (dimension == "weight") {
}else if (dimension == "width" && comparator == "<" && width >= value) { comparison_value = weight;
return false; } else {
}else if (dimension == "width" && comparator == ">" && width <= value) { continue;
}
if ((comparator == "<" && comparison_value >= value) ||
(comparator == ">" && comparison_value <= value)) {
return false; return false;
} }
return true;
} }
} }
return true; return true;