diff options
| -rw-r--r-- | common/rawaccel-validate.hpp | 8 | ||||
| -rw-r--r-- | wrapper/wrapper.cpp | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/common/rawaccel-validate.hpp b/common/rawaccel-validate.hpp index e776298..a03f56a 100644 --- a/common/rawaccel-validate.hpp +++ b/common/rawaccel-validate.hpp @@ -6,8 +6,8 @@ namespace rawaccel { struct valid_ret_t { - int count_x = 0; - int count_y = 0; + int last_x = 0; + int last_y = 0; int count = 0; explicit operator bool() const @@ -136,9 +136,9 @@ namespace rawaccel { check_accel(args.argsv.x); if (!args.combine_mags) { - ret.count_x = ret.count; + ret.last_x = ret.count; check_accel(args.argsv.y); - ret.count_y = ret.count; + ret.last_y = ret.count; } if (args.dpi <= 0) { diff --git a/wrapper/wrapper.cpp b/wrapper/wrapper.cpp index 6344b77..4e6c4f1 100644 --- a/wrapper/wrapper.cpp +++ b/wrapper/wrapper.cpp @@ -462,8 +462,8 @@ public ref class SettingsErrors public: List<String^>^ list; - int countX; - int countY; + int lastX; + int lastY; delegate void MsgHandler(const char*); @@ -486,9 +486,9 @@ public: Marshal::StructureToPtr(settings, (IntPtr)args_ptr, false); list = gcnew List<String^>(); - auto [cx, cy, _] = ra::valid(*args_ptr, fp); - countX = cx; - countY = cy; + auto [last_x, last_y, _] = ra::valid(*args_ptr, fp); + lastX = last_x; + lastY = last_y; gch.Free(); delete args_ptr; @@ -503,15 +503,15 @@ public: { Text::StringBuilder^ sb = gcnew Text::StringBuilder(); - for each (auto s in list->GetRange(0, countX)) + for each (auto s in list->GetRange(0, lastX)) { sb->AppendFormat("x: {0}\n", s); } - for each (auto s in list->GetRange(countX, countY)) + for each (auto s in list->GetRange(lastX, lastY - lastX)) { sb->AppendFormat("y: {0}\n", s); } - for each (auto s in list->GetRange(countY, list->Count)) + for each (auto s in list->GetRange(lastY, list->Count - lastY)) { sb->AppendLine(s); } |