From a1bd83e8aab36316f110c36feac9086f7cd95cca Mon Sep 17 00:00:00 2001
From: Karol Suprynowicz <ksuprynowicz@post.pl>
Date: Sat, 5 Apr 2025 22:40:27 +0200
Subject: [PATCH] Change variable names

---
 interface/src/Application_UI.cpp                     |  6 +++---
 .../src/display-plugins/CompositorHelper.cpp         | 12 ++++++------
 .../src/display-plugins/CompositorHelper.h           |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/interface/src/Application_UI.cpp b/interface/src/Application_UI.cpp
index 9601968d4e..ee40319e28 100644
--- a/interface/src/Application_UI.cpp
+++ b/interface/src/Application_UI.cpp
@@ -270,11 +270,11 @@ void Application::setHmdTabletBecomesToolbarSetting(bool value) {
 }
 
 void Application::setMouseCaptureVR(bool value) {
-    _defaultMouseLock.set(value);
-    getApplicationCompositor().setMouseLockCompositVR(value);
+    _defaultMouseCaptureVR.set(value);
+    getApplicationCompositor().setEnableMouseCaptureVR(value);
 }
 bool Application::getMouseCaptureVR() {
-    return _defaultMouseLock.get();
+    return _defaultMouseCaptureVR.get();
 }
 
 void Application::setShowGraphicsIcon(bool value) {
diff --git a/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
index 39affa66a3..ed16b5875c 100644
--- a/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
+++ b/libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
@@ -188,7 +188,7 @@ static bool isWindowActive() {
 }
 
 bool CompositorHelper::shouldCaptureMouse() const {
-    if (!_allowMouseCaptureVR) {
+    if (!_allowMouseCapture) {
         return false;
     }
 
@@ -196,7 +196,7 @@ bool CompositorHelper::shouldCaptureMouse() const {
         return false;
     }
     
-    if (!_mouseLockComposit) {
+    if (!_enableMouseCaptureVR) {
         return false;
     }
 
@@ -214,14 +214,14 @@ bool CompositorHelper::shouldCaptureMouse() const {
 }
 
 void CompositorHelper::setAllowMouseCapture(bool capture) {
-    if (capture != _allowMouseCaptureVR) {
-        _allowMouseCaptureVR = capture;
+    if (capture != _allowMouseCapture) {
+        _allowMouseCapture = capture;
         emit allowMouseCaptureChanged();
     }
 }
 
-void CompositorHelper::setMouseLockCompositVR(bool capture) {
-    _mouseLockComposit = capture;
+void CompositorHelper::setEnableMouseCaptureVR(bool capture) {
+    _enableMouseCaptureVR = capture;
 }
 
 void CompositorHelper::handleLeaveEvent() {
diff --git a/libraries/display-plugins/src/display-plugins/CompositorHelper.h b/libraries/display-plugins/src/display-plugins/CompositorHelper.h
index 4d1dcda464..a952b80238 100644
--- a/libraries/display-plugins/src/display-plugins/CompositorHelper.h
+++ b/libraries/display-plugins/src/display-plugins/CompositorHelper.h
@@ -104,9 +104,9 @@ public:
 
     bool shouldCaptureMouse() const;
 
-    bool getAllowMouseCapture() const { return _allowMouseCaptureVR; }
+    bool getAllowMouseCapture() const { return _allowMouseCapture; }
     void setAllowMouseCapture(bool capture);
-    void setMouseLockCompositVR(bool capture);
+    void setEnableMouseCaptureVR(bool capture);
 
     /// if the reticle is pointing to a system overlay (a dialog box for example) then the function returns true otherwise false
     bool getReticleOverDesktop() const;
@@ -169,8 +169,8 @@ private:
 
     bool _reticleOverQml { false };
 
-    std::atomic<bool> _allowMouseCaptureVR{ true };
-    std::atomic<bool> _mouseLockComposit{ false };
+    std::atomic<bool> _allowMouseCapture{ true };
+    std::atomic<bool> _enableMouseCaptureVR{ false };
 
     bool _fakeMouseEvent { false };