birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expose sticky select option to the SettingsRegistry and disable by default (#4149)

Browse Source 
* expose sticky select option to the SettingsRegistry

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* update missed callsites after API change to Manipulator Test Framework

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* updates following review feedback

Signed-off-by: hultonha <hultonha@amazon.co.uk>
This commit is contained in:
hultonha
2021-09-16 09:14:37 +01:00
committed by GitHub
parent a8908a987a
commit 7e85b1512a
19 changed files with 275 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/EditorPreferencesPageViewportGeneral.h
+10 -12
View File
@@ -5,18 +5,17 @@
* SPDX-License-Identifier: Apache-2.0 OR MIT
*
*/
#pragma once
#include "Include/IPreferencesPage.h"
#include <AzCore/Serialization/SerializeContext.h>
#include <AzCore/Serialization/EditContext.h>
#include <AzCore/RTTI/RTTI.h>
#include <AzCore/Math/Color.h>
#include <AzCore/RTTI/RTTI.h>
#include <AzCore/Serialization/EditContext.h>
#include <AzCore/Serialization/SerializeContext.h>
#include <QIcon>
class CEditorPreferencesPage_ViewportGeneral
: public IPreferencesPage
class CEditorPreferencesPage_ViewportGeneral : public IPreferencesPage
{
public:
AZ_RTTI(CEditorPreferencesPage_ViewportGeneral, "{8511FF7F-F774-47E1-A99B-3DE3A867E403}", IPreferencesPage)
@@ -26,12 +25,12 @@ public:
CEditorPreferencesPage_ViewportGeneral();
virtual ~CEditorPreferencesPage_ViewportGeneral() = default;
virtual const char* GetCategory() override { return "Viewports"; }
virtual const char* GetCategory() override;
virtual const char* GetTitle() override;
virtual QIcon& GetIcon() override;
virtual void OnApply() override;
virtual void OnCancel() override {}
virtual bool OnQueryCancel() override { return true; }
virtual void OnCancel() override;
virtual bool OnQueryCancel() override;
private:
void InitializeSettings();
@@ -43,7 +42,8 @@ private:
bool m_sync2DViews;
float m_defaultFOV;
float m_defaultAspectRatio;
bool m_enableContextMenu;
bool m_contextMenuEnabled;
bool m_stickySelectEnabled;
};
struct Display
@@ -106,5 +106,3 @@ private:
SelectionPreviewColor m_selectionPreviewColor;
QIcon m_icon;
};