tanner/logiops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Enable compatibility with libconfig older than v1.5"

Browse Source
This commit is contained in:
pixl
2020-11-23 15:42:29 -05:00
committed by GitHub
parent 1d6a89881f
commit ec8115634d
13 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logid/features/HiresScroll.cpp
+6 -6
View File
@@ -157,7 +157,7 @@ HiresScroll::Config::Config(Device *dev) : DeviceFeature::Config(dev)
_mode = 0;
_mask = 0;
try {
auto& hires = config_root["hires"];
auto& hires = config_root.lookup("hires");
if(hires.getType() == libconfig::Setting::TypeBoolean) {
_mask |= hidpp20::HiresScroll::Mode::HiRes;
if(hires)
@@ -169,7 +169,7 @@ HiresScroll::Config::Config(Device *dev) : DeviceFeature::Config(dev)
} catch(libconfig::SettingNotFoundException& e) { }
try {
auto& invert = config_root["invert"];
auto& invert = config_root.lookup("invert");
if(invert.getType() == libconfig::Setting::TypeBoolean) {
_mask |= hidpp20::HiresScroll::Mode::Inverted;
if(invert)
@@ -181,7 +181,7 @@ HiresScroll::Config::Config(Device *dev) : DeviceFeature::Config(dev)
} catch(libconfig::SettingNotFoundException& e) { }
try {
auto& target = config_root["target"];
auto& target = config_root.lookup("target");
if(target.getType() == libconfig::Setting::TypeBoolean) {
_mask |= hidpp20::HiresScroll::Mode::Target;
if(target)
@@ -194,7 +194,7 @@ HiresScroll::Config::Config(Device *dev) : DeviceFeature::Config(dev)
if(_mode & hidpp20::HiresScroll::Mode::Target) {
try {
auto& up = config_root["up"];
auto& up = config_root.lookup("up");
try {
auto g = actions::Gesture::makeGesture(dev, up);
if(g->wheelCompatibility()) {
@@ -214,7 +214,7 @@ HiresScroll::Config::Config(Device *dev) : DeviceFeature::Config(dev)
}
try {
auto& down = config_root["down"];
auto& down = config_root.lookup("down");
try {
auto g = actions::Gesture::makeGesture(dev, down);
if(g->wheelCompatibility()) {
@@ -258,4 +258,4 @@ const std::shared_ptr<logid::actions::Gesture>&
HiresScroll::Config::downAction() const
{
return _down_action;
}
}