Skip to content

Commit fc60a28

Browse files
adriengivryadriengivry
authored
UI styles rework (#761)
1 parent f4e340c commit fc60a28

40 files changed

Lines changed: 967 additions & 511 deletions

‎Sources/OvCore/include/OvCore/Helpers/GUIDrawer.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ namespace OvCore::Helpers
4949
class GUIDrawer
5050
{
5151
public:
52-
static const OvUI::Types::Color TitleColor;
53-
5452
static const float _MIN_FLOAT;
5553
static const float _MAX_FLOAT;
5654

‎Sources/OvCore/src/OvCore/ECS/Components/Behaviour.cpp‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
#include <OvUI/Widgets/Selection/CheckBox.h>
3636
#include <OvUI/Widgets/Texts/TextColored.h>
3737

38+
#include <OvUI/Styling/Style.h>
39+
3840
OvCore::ECS::Components::Behaviour::Behaviour(ECS::Actor& p_owner, const std::string& p_name) :
3941
name(p_name), AComponent(p_owner)
4042
{
@@ -268,13 +270,13 @@ void OvCore::ECS::Components::Behaviour::OnInspector(OvUI::Internal::WidgetConta
268270

269271
if (!m_script)
270272
{
271-
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("No scripting context", OvUI::Types::Color::White);
273+
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("No scripting context", OVUI_STYLE(TextDisabled));
272274
p_root.CreateWidget<OvUI::Widgets::Layout::Dummy>();
273275
}
274276
else if (m_script->IsValid())
275277
{
276-
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Ready", OvUI::Types::Color::Green);
277-
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Script properties will appear below", OvUI::Types::Color::White);
278+
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Ready", OVUI_STYLE(Success));
279+
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Script properties will appear below", OVUI_STYLE(TextDisabled));
278280

279281
for (const auto& [fieldKey, fieldValue] : m_scriptProperties)
280282
{
@@ -297,7 +299,7 @@ void OvCore::ECS::Components::Behaviour::OnInspector(OvUI::Internal::WidgetConta
297299
auto& labelGroup = p_root.CreateWidget<OvUI::Widgets::Layout::Group>();
298300
auto& unlockBox = labelGroup.CreateWidget<OvUI::Widgets::Selection::CheckBox>(unlocked);
299301
unlockBox.lineBreak = false;
300-
labelGroup.CreateWidget<OvUI::Widgets::Texts::TextColored>(key, GUIDrawer::TitleColor);
302+
labelGroup.CreateWidget<OvUI::Widgets::Texts::TextColored>(key, OVUI_STYLE(InspectorTitle));
301303

302304
// Input widget on the row below
303305
OvUI::Widgets::AWidget* inputPtr = nullptr;
@@ -489,7 +491,7 @@ void OvCore::ECS::Components::Behaviour::OnInspector(OvUI::Internal::WidgetConta
489491
}
490492
else
491493
{
492-
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Invalid Script", OvUI::Types::Color::Red);
493-
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Check the console for more information.", OvUI::Types::Color::White);
494+
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Invalid Script", OVUI_STYLE(Danger));
495+
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Check the console for more information.", OVUI_STYLE(TextDisabled));
494496
}
495497
}

‎Sources/OvCore/src/OvCore/ECS/Components/CModelRenderer.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <OvCore/ECS/Components/CSkinnedMeshRenderer.h>
1010

1111
#include <OvUI/Plugins/DDTarget.h>
12+
#include <OvUI/Styling/Style.h>
1213
#include <OvUI/Widgets/Drags/DragFloat.h>
1314
#include <OvUI/Widgets/Selection/CheckBox.h>
1415
#include <OvUI/Widgets/Selection/ComboBox.h>
@@ -100,12 +101,12 @@ void OvCore::ECS::Components::CModelRenderer::OnInspector(OvUI::Internal::Widget
100101
auto& boundingModeDispatcher = boundingMode.AddPlugin<OvUI::Plugins::DataDispatcher<int>>();
101102
boundingModeDispatcher.RegisterReference(reinterpret_cast<int&>(m_frustumBehaviour));
102103

103-
auto& centerLabel = p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Bounding Sphere Center", GUIDrawer::TitleColor);
104+
auto& centerLabel = p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Bounding Sphere Center", OVUI_STYLE(InspectorTitle));
104105
auto& centerWidget = p_root.CreateWidget<OvUI::Widgets::Drags::DragMultipleScalars<float, 3>>(GUIDrawer::GetDataType<float>(), GUIDrawer::_MIN_FLOAT, GUIDrawer::_MAX_FLOAT, 0.f, 0.05f, "", GUIDrawer::GetFormat<float>());
105106
auto& centerDispatcher = centerWidget.AddPlugin<OvUI::Plugins::DataDispatcher<std::array<float, 3>>>();
106107
centerDispatcher.RegisterReference(reinterpret_cast<std::array<float, 3>&>(m_customBoundingSphere.position));
107108

108-
auto& radiusLabel = p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Bounding Sphere Radius", GUIDrawer::TitleColor);
109+
auto& radiusLabel = p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>("Bounding Sphere Radius", OVUI_STYLE(InspectorTitle));
109110
auto& radiusWidget = p_root.CreateWidget<OvUI::Widgets::Drags::DragFloat>(0.0f, GUIDrawer::_MAX_FLOAT, 0.f, 0.1f);
110111
auto& radiusDispatcher = radiusWidget.AddPlugin<OvUI::Plugins::DataDispatcher<float>>();
111112
radiusDispatcher.RegisterReference(m_customBoundingSphere.radius);

‎Sources/OvCore/src/OvCore/ECS/Components/CPointLight.cpp‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <OvCore/ECS/Actor.h>
88
#include <OvCore/ECS/Components/CPointLight.h>
99

10+
#include <OvUI/Styling/Style.h>
1011
#include <OvUI/Widgets/Texts/Text.h>
1112
#include <OvUI/Widgets/Drags/DragFloat.h>
1213
#include <OvUI/Widgets/Selection/ColorEdit.h>
@@ -93,16 +94,22 @@ void OvCore::ECS::Components::CPointLight::OnInspector(OvUI::Internal::WidgetCon
9394
auto& constantPreset = presetsRoot.CreateWidget<OvUI::Widgets::Buttons::Button>("Constant");
9495
constantPreset.ClickedEvent += [this] { m_data.constant = 1.f, m_data.linear = m_data.quadratic = 0.f; };
9596
constantPreset.lineBreak = false;
96-
constantPreset.idleBackgroundColor = { 0.7f, 0.5f, 0.f };
97+
constantPreset.backgroundColor = OVUI_STYLE(Warning);
98+
constantPreset.hoveredBackgroundColor = OVUI_STYLE(WarningHovered);
99+
constantPreset.clickedBackgroundColor = OVUI_STYLE(WarningActive);
97100

98101
auto& linearPreset = presetsRoot.CreateWidget<OvUI::Widgets::Buttons::Button>("Linear");
99102
linearPreset.ClickedEvent += [this] { m_data.linear = 1.f, m_data.constant = m_data.quadratic = 0.f; };
100103
linearPreset.lineBreak = false;
101-
linearPreset.idleBackgroundColor = { 0.7f, 0.5f, 0.f };
104+
linearPreset.backgroundColor = OVUI_STYLE(Warning);
105+
linearPreset.hoveredBackgroundColor = OVUI_STYLE(WarningHovered);
106+
linearPreset.clickedBackgroundColor = OVUI_STYLE(WarningActive);
102107

103108
auto& quadraticPreset = presetsRoot.CreateWidget<OvUI::Widgets::Buttons::Button>("Quadratic");
104109
quadraticPreset.ClickedEvent += [this] { m_data.quadratic = 1.f, m_data.constant = m_data.linear = 0.f; };
105-
quadraticPreset.idleBackgroundColor = { 0.7f, 0.5f, 0.f };
110+
quadraticPreset.backgroundColor = OVUI_STYLE(Warning);
111+
quadraticPreset.hoveredBackgroundColor = OVUI_STYLE(WarningHovered);
112+
quadraticPreset.clickedBackgroundColor = OVUI_STYLE(WarningActive);
106113

107114
GUIDrawer::DrawScalar<float>(p_root, "Constant", m_data.constant, 0.005f, 0.f);
108115
GUIDrawer::DrawScalar<float>(p_root, "Linear", m_data.linear, 0.005f, 0.f);

‎Sources/OvCore/src/OvCore/ECS/Components/CSpotLight.cpp‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <OvCore/ECS/Actor.h>
88
#include <OvCore/ECS/Components/CSpotLight.h>
99

10+
#include <OvUI/Styling/Style.h>
1011
#include <OvUI/Widgets/Buttons/Button.h>
1112
#include <OvUI/Widgets/Drags/DragFloat.h>
1213
#include <OvUI/Widgets/Layout/Group.h>
@@ -120,16 +121,22 @@ void OvCore::ECS::Components::CSpotLight::OnInspector(OvUI::Internal::WidgetCont
120121
auto& constantPreset = presetsRoot.CreateWidget<OvUI::Widgets::Buttons::Button>("Constant");
121122
constantPreset.ClickedEvent += [this] { m_data.constant = 1.f, m_data.linear = m_data.quadratic = 0.f; };
122123
constantPreset.lineBreak = false;
123-
constantPreset.idleBackgroundColor = { 0.7f, 0.5f, 0.f };
124+
constantPreset.backgroundColor = OVUI_STYLE(Warning);
125+
constantPreset.hoveredBackgroundColor = OVUI_STYLE(WarningHovered);
126+
constantPreset.clickedBackgroundColor = OVUI_STYLE(WarningActive);
124127

125128
auto& linearPreset = presetsRoot.CreateWidget<OvUI::Widgets::Buttons::Button>("Linear");
126129
linearPreset.ClickedEvent += [this] { m_data.linear = 1.f, m_data.constant = m_data.quadratic = 0.f; };
127130
linearPreset.lineBreak = false;
128-
linearPreset.idleBackgroundColor = { 0.7f, 0.5f, 0.f };
131+
linearPreset.backgroundColor = OVUI_STYLE(Warning);
132+
linearPreset.hoveredBackgroundColor = OVUI_STYLE(WarningHovered);
133+
linearPreset.clickedBackgroundColor = OVUI_STYLE(WarningActive);
129134

130135
auto& quadraticPreset = presetsRoot.CreateWidget<OvUI::Widgets::Buttons::Button>("Quadratic");
131136
quadraticPreset.ClickedEvent += [this] { m_data.quadratic = 1.f, m_data.constant = m_data.linear = 0.f; };
132-
quadraticPreset.idleBackgroundColor = { 0.7f, 0.5f, 0.f };
137+
quadraticPreset.backgroundColor = OVUI_STYLE(Warning);
138+
quadraticPreset.hoveredBackgroundColor = OVUI_STYLE(WarningHovered);
139+
quadraticPreset.clickedBackgroundColor = OVUI_STYLE(WarningActive);
133140

134141
GUIDrawer::DrawScalar<float>(p_root, "Constant", m_data.constant, 0.005f, 0.f);
135142
GUIDrawer::DrawScalar<float>(p_root, "Linear", m_data.linear, 0.005f, 0.f);

‎Sources/OvCore/src/OvCore/Helpers/GUIDrawer.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <OvUI/Widgets/Buttons/Button.h>
2525
#include <OvUI/Widgets/Buttons/Toggle.h>
2626
#include <OvUI/Plugins/DDTarget.h>
27+
#include <OvUI/Styling/Style.h>
2728

2829
#include <OvCore/Global/ServiceLocator.h>
2930
#include <OvCore/ResourceManagement/ModelManager.h>
@@ -34,13 +35,12 @@
3435

3536
#include "OvCore/Helpers/GUIDrawer.h"
3637

37-
const OvUI::Types::Color OvCore::Helpers::GUIDrawer::TitleColor = { 0.85f, 0.65f, 0.0f };
3838
const float OvCore::Helpers::GUIDrawer::_MIN_FLOAT = -999999999.f;
3939
const float OvCore::Helpers::GUIDrawer::_MAX_FLOAT = +999999999.f;
4040

4141
void OvCore::Helpers::GUIDrawer::CreateTitle(OvUI::Internal::WidgetContainer& p_root, const std::string & p_name)
4242
{
43-
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>(p_name, TitleColor);
43+
p_root.CreateWidget<OvUI::Widgets::Texts::TextColored>(p_name, OVUI_STYLE(InspectorTitle));
4444
}
4545

4646
void OvCore::Helpers::GUIDrawer::DrawBoolean(OvUI::Internal::WidgetContainer & p_root, const std::string & p_name, bool & p_data)

‎Sources/OvEditor/include/OvEditor/Core/EditorActions.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#define EDITOR_EVENT(target) OvCore::Global::ServiceLocator::Get<OvEditor::Core::EditorActions>().target
2020
#define EDITOR_CONTEXT(instance) OvCore::Global::ServiceLocator::Get<OvEditor::Core::EditorActions>().GetContext().instance
2121
#define EDITOR_PANEL(type, id) OvCore::Global::ServiceLocator::Get<OvEditor::Core::EditorActions>().GetPanelsManager().GetPanelAs<type>(id)
22-
#define EDITOR_UI_SCALE EDITOR_CONTEXT(uiManager)->GetScale()
2322

2423
namespace tinyxml2
2524
{

‎Sources/OvEditor/src/OvEditor/Core/ProjectHub.cpp‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <OvTools/Utils/PathParser.h>
1818
#include <OvTools/Utils/SystemCalls.h>
1919

20+
#include <OvUI/Styling/Style.h>
2021
#include <OvUI/Widgets/Buttons/Button.h>
2122
#include <OvUI/Widgets/InputFields/InputText.h>
2223
#include <OvUI/Widgets/Layout/Columns.h>
@@ -64,8 +65,12 @@ namespace OvEditor::Core
6465

6566
_UpdateGoButton({});
6667

67-
openProjectButton.idleBackgroundColor = { 0.7f, 0.5f, 0.f };
68-
newProjectButton.idleBackgroundColor = { 0.f, 0.5f, 0.0f };
68+
openProjectButton.backgroundColor = OVUI_STYLE(Warning);
69+
openProjectButton.hoveredBackgroundColor = OVUI_STYLE(WarningHovered);
70+
openProjectButton.clickedBackgroundColor = OVUI_STYLE(WarningActive);
71+
newProjectButton.backgroundColor = OVUI_STYLE(Success);
72+
newProjectButton.hoveredBackgroundColor = OVUI_STYLE(SuccessHovered);
73+
newProjectButton.clickedBackgroundColor = OVUI_STYLE(SuccessActive);
6974

7075
openProjectButton.ClickedEvent += [this] {
7176
OvWindowing::Dialogs::OpenFileDialog dialog("Open project");
@@ -136,8 +141,12 @@ namespace OvEditor::Core
136141
auto& openButton = actions.CreateWidget<OvUI::Widgets::Buttons::Button>("Open");
137142
auto& deleteButton = actions.CreateWidget<OvUI::Widgets::Buttons::Button>("Delete");
138143

139-
openButton.idleBackgroundColor = { 0.7f, 0.5f, 0.f };
140-
deleteButton.idleBackgroundColor = { 0.5f, 0.f, 0.f };
144+
openButton.backgroundColor = OVUI_STYLE(Warning);
145+
openButton.hoveredBackgroundColor = OVUI_STYLE(WarningHovered);
146+
openButton.clickedBackgroundColor = OVUI_STYLE(WarningActive);
147+
deleteButton.backgroundColor = OVUI_STYLE(Danger);
148+
deleteButton.hoveredBackgroundColor = OVUI_STYLE(DangerHovered);
149+
deleteButton.clickedBackgroundColor = OVUI_STYLE(DangerActive);
141150

142151
openButton.ClickedEvent += [this, &text, &actions, project] {
143152
if (!_TryFinish({ project }))
@@ -174,7 +183,9 @@ namespace OvEditor::Core
174183
void _UpdateGoButton(const std::string& p_path)
175184
{
176185
const bool validPath = !p_path.empty();
177-
m_goButton->idleBackgroundColor = validPath ? OvUI::Types::Color{ 0.f, 0.5f, 0.0f } : OvUI::Types::Color{ 0.1f, 0.1f, 0.1f };
186+
m_goButton->backgroundColor = validPath ? OVUI_STYLE(Success) : OVUI_STYLE(Button);
187+
m_goButton->hoveredBackgroundColor = validPath ? OVUI_STYLE(SuccessHovered) : OVUI_STYLE(ButtonHovered);
188+
m_goButton->clickedBackgroundColor = validPath ? OVUI_STYLE(SuccessActive) : OVUI_STYLE(ButtonActive);
178189
m_goButton->disabled = !validPath;
179190
}
180191

‎Sources/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include <OvUI/Plugins/ContextualMenu.h>
4141
#include <OvUI/Plugins/DDSource.h>
4242
#include <OvUI/Plugins/DDTarget.h>
43+
#include <OvUI/Styling/Style.h>
4344
#include <OvUI/Widgets/Buttons/Button.h>
4445
#include <OvUI/Widgets/Layout/Group.h>
4546
#include <OvUI/Widgets/Texts/TextClickable.h>
@@ -872,16 +873,22 @@ OvEditor::Panels::AssetBrowser::AssetBrowser
872873
auto& refreshButton = CreateWidget<Buttons::Button>("Refresh");
873874
refreshButton.ClickedEvent += std::bind(&AssetBrowser::Refresh, this);
874875
refreshButton.lineBreak = false;
875-
refreshButton.idleBackgroundColor = { 0.f, 0.5f, 0.0f };
876+
refreshButton.backgroundColor = OVUI_STYLE(Success);
877+
refreshButton.hoveredBackgroundColor = OVUI_STYLE(SuccessHovered);
878+
refreshButton.clickedBackgroundColor = OVUI_STYLE(SuccessActive);
876879

877880
auto& importButton = CreateWidget<Buttons::Button>("Import Asset");
878881
importButton.ClickedEvent += EDITOR_BIND(ImportAsset, EDITOR_CONTEXT(projectAssetsPath).string());
879-
importButton.idleBackgroundColor = { 0.7f, 0.5f, 0.0f };
882+
importButton.backgroundColor = OVUI_STYLE(Warning);
883+
importButton.hoveredBackgroundColor = OVUI_STYLE(WarningHovered);
884+
importButton.clickedBackgroundColor = OVUI_STYLE(WarningActive);
880885
importButton.lineBreak = false;
881886

882887
auto& codeEditorButton = CreateWidget<Buttons::Button>("Open Code Editor");
883888
codeEditorButton.ClickedEvent += [this] { EDITOR_EXEC(OpenInCodeEditor(EDITOR_CONTEXT(projectFolder))); };
884-
codeEditorButton.idleBackgroundColor = { 0.1f, 0.3f, 0.7f };
889+
codeEditorButton.backgroundColor = OVUI_STYLE(Accent);
890+
codeEditorButton.hoveredBackgroundColor = OVUI_STYLE(AccentHovered);
891+
codeEditorButton.clickedBackgroundColor = OVUI_STYLE(AccentActive);
885892

886893
m_assetList = &CreateWidget<Layout::Group>();
887894

‎Sources/OvEditor/src/OvEditor/Panels/AssetProperties.cpp‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <OvTools/Utils/PathParser.h>
2222
#include <OvTools/Utils/SizeConverter.h>
2323

24+
#include <OvUI/Styling/Style.h>
2425
#include <OvUI/Widgets/Buttons/Button.h>
2526
#include <OvUI/Widgets/Layout/Group.h>
2627
#include <OvUI/Widgets/Layout/GroupCollapsable.h>
@@ -56,12 +57,12 @@ OvEditor::Panels::AssetProperties::AssetProperties
5657
m_settings = &CreateWidget<OvUI::Widgets::Layout::GroupCollapsable>("Settings");
5758
m_settings->neverDisabled = true;
5859
m_settingsColumns = &m_settings->CreateWidget<OvUI::Widgets::Layout::Columns<2>>();
59-
m_settingsColumns->widths[0] = 150 * EDITOR_UI_SCALE;
60+
m_settingsColumns->widths[0] = 150 * OVUI_SCALE;
6061

6162
m_info = &CreateWidget<OvUI::Widgets::Layout::GroupCollapsable>("Info");
6263
m_info->neverDisabled = true;
6364
m_infoColumns = &m_info->CreateWidget<OvUI::Widgets::Layout::Columns<2>>();
64-
m_infoColumns->widths[0] = 150 * EDITOR_UI_SCALE;
65+
m_infoColumns->widths[0] = 150 * OVUI_SCALE;
6566

6667
m_settings->enabled = m_info->enabled = false;
6768
}
@@ -142,7 +143,9 @@ void OvEditor::Panels::AssetProperties::Preview()
142143
void OvEditor::Panels::AssetProperties::CreateHeaderButtons()
143144
{
144145
m_applyButton = &CreateWidget<OvUI::Widgets::Buttons::Button>("Apply");
145-
m_applyButton->idleBackgroundColor = { 0.0f, 0.5f, 0.0f };
146+
m_applyButton->backgroundColor = OVUI_STYLE(Success);
147+
m_applyButton->hoveredBackgroundColor = OVUI_STYLE(SuccessHovered);
148+
m_applyButton->clickedBackgroundColor = OVUI_STYLE(SuccessActive);
146149
m_applyButton->tooltip = "Save changes and reimport the asset with the new settings";
147150
m_applyButton->enabled = false;
148151
m_applyButton->lineBreak = false;
@@ -163,7 +166,9 @@ void OvEditor::Panels::AssetProperties::CreateHeaderButtons()
163166

164167
m_resetButton = &CreateWidget<OvUI::Widgets::Buttons::Button>("Reset");
165168
m_resetButton->tooltip = "Reset all settings to default values";
166-
m_resetButton->idleBackgroundColor = { 0.5f, 0.0f, 0.0f };
169+
m_resetButton->backgroundColor = OVUI_STYLE(Danger);
170+
m_resetButton->hoveredBackgroundColor = OVUI_STYLE(DangerHovered);
171+
m_resetButton->clickedBackgroundColor = OVUI_STYLE(DangerActive);
167172
m_resetButton->enabled = false;
168173
m_resetButton->lineBreak = false;
169174
m_resetButton->ClickedEvent += [this] {
@@ -178,7 +183,7 @@ void OvEditor::Panels::AssetProperties::CreateHeaderButtons()
178183
void OvEditor::Panels::AssetProperties::CreateAssetSelector()
179184
{
180185
auto& columns = CreateWidget<OvUI::Widgets::Layout::Columns<2>>();
181-
columns.widths[0] = 150 * EDITOR_UI_SCALE;
186+
columns.widths[0] = 150 * OVUI_SCALE;
182187
m_assetSelector = &OvCore::Helpers::GUIDrawer::DrawAsset(columns, "Target", m_resource, &m_targetChanged);
183188
const auto& widgets = columns.GetWidgets();
184189
widgets[widgets.size() - 1].first->neverDisabled = true;

0 commit comments

Comments
 (0)