Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:51:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Change variable names

Browse source
This commit is contained in:
Karol Suprynowicz 2025-04-05 22:40:27 +02:00
parent aced56d934
commit a1bd83e8aa
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application_UI.cpp
View file

@ -270,11 +270,11 @@ void Application::setHmdTabletBecomesToolbarSetting(bool value) {
} }
void Application::setMouseCaptureVR(bool value) { void Application::setMouseCaptureVR(bool value) {
_defaultMouseLock.set(value); _defaultMouseCaptureVR.set(value);
getApplicationCompositor().setMouseLockCompositVR(value); getApplicationCompositor().setEnableMouseCaptureVR(value);
} }
bool Application::getMouseCaptureVR() { bool Application::getMouseCaptureVR() {
return _defaultMouseLock.get(); return _defaultMouseCaptureVR.get();
} }
void Application::setShowGraphicsIcon(bool value) { void Application::setShowGraphicsIcon(bool value) {

12
libraries/display-plugins/src/display-plugins/CompositorHelper.cpp
View file

@ -188,7 +188,7 @@ static bool isWindowActive() {
} }
bool CompositorHelper::shouldCaptureMouse() const { bool CompositorHelper::shouldCaptureMouse() const {
if (!_allowMouseCaptureVR) { if (!_allowMouseCapture) {
return false; return false;
} }
@ -196,7 +196,7 @@ bool CompositorHelper::shouldCaptureMouse() const {
return false; return false;
} }
if (!_mouseLockComposit) { if (!_enableMouseCaptureVR) {
return false; return false;
} }
@ -214,14 +214,14 @@ bool CompositorHelper::shouldCaptureMouse() const {
} }
void CompositorHelper::setAllowMouseCapture(bool capture) { void CompositorHelper::setAllowMouseCapture(bool capture) {
if (capture != _allowMouseCaptureVR) { if (capture != _allowMouseCapture) {
_allowMouseCaptureVR = capture; _allowMouseCapture = capture;
emit allowMouseCaptureChanged(); emit allowMouseCaptureChanged();
} }
} }
void CompositorHelper::setMouseLockCompositVR(bool capture) { void CompositorHelper::setEnableMouseCaptureVR(bool capture) {
_mouseLockComposit = capture; _enableMouseCaptureVR = capture;
} }
void CompositorHelper::handleLeaveEvent() { void CompositorHelper::handleLeaveEvent() {

8
libraries/display-plugins/src/display-plugins/CompositorHelper.h
View file

@ -104,9 +104,9 @@ public:
bool shouldCaptureMouse() const; bool shouldCaptureMouse() const;
bool getAllowMouseCapture() const { return _allowMouseCaptureVR; } bool getAllowMouseCapture() const { return _allowMouseCapture; }
void setAllowMouseCapture(bool capture); 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 /// if the reticle is pointing to a system overlay (a dialog box for example) then the function returns true otherwise false
bool getReticleOverDesktop() const; bool getReticleOverDesktop() const;
@ -169,8 +169,8 @@ private:
bool _reticleOverQml { false }; bool _reticleOverQml { false };
std::atomic<bool> _allowMouseCaptureVR{ true }; std::atomic<bool> _allowMouseCapture{ true };
std::atomic<bool> _mouseLockComposit{ false }; std::atomic<bool> _enableMouseCaptureVR{ false };
bool _fakeMouseEvent { false }; bool _fakeMouseEvent { false };