Widgets: Improve theme
- move simple styles classes ton their own file - add button hovered texture - add button hovered/pressed texture - add label style
This commit is contained in:
parent
b20897a2fb
commit
461a06ab8c
|
|
@ -14,8 +14,6 @@
|
||||||
|
|
||||||
namespace Nz
|
namespace Nz
|
||||||
{
|
{
|
||||||
class DefaultDefaultButtonWidgetStyle;
|
|
||||||
|
|
||||||
class NAZARA_WIDGETS_API DefaultWidgetTheme : public WidgetTheme
|
class NAZARA_WIDGETS_API DefaultWidgetTheme : public WidgetTheme
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
@ -25,43 +23,17 @@ namespace Nz
|
||||||
~DefaultWidgetTheme() = default;
|
~DefaultWidgetTheme() = default;
|
||||||
|
|
||||||
std::unique_ptr<ButtonWidgetStyle> CreateStyle(ButtonWidget* buttonWidget) const override;
|
std::unique_ptr<ButtonWidgetStyle> CreateStyle(ButtonWidget* buttonWidget) const override;
|
||||||
|
std::unique_ptr<LabelWidgetStyle> CreateStyle(LabelWidget* buttonWidget) const override;
|
||||||
|
|
||||||
DefaultWidgetTheme& operator=(const DefaultWidgetTheme&) = delete;
|
DefaultWidgetTheme& operator=(const DefaultWidgetTheme&) = delete;
|
||||||
DefaultWidgetTheme& operator=(DefaultWidgetTheme&&) = default;
|
DefaultWidgetTheme& operator=(DefaultWidgetTheme&&) = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::shared_ptr<Material> m_buttonMaterial;
|
std::shared_ptr<Material> m_buttonMaterial;
|
||||||
|
std::shared_ptr<Material> m_hoveredButtonMaterial;
|
||||||
|
std::shared_ptr<Material> m_pressedHoveredMaterial;
|
||||||
std::shared_ptr<Material> m_pressedButtonMaterial;
|
std::shared_ptr<Material> m_pressedButtonMaterial;
|
||||||
};
|
};
|
||||||
|
|
||||||
class NAZARA_WIDGETS_API DefaultButtonWidgetStyle : public ButtonWidgetStyle
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
DefaultButtonWidgetStyle(ButtonWidget* buttonWidget, std::shared_ptr<Material> defaultMaterial, std::shared_ptr<Material> pressedMaterial);
|
|
||||||
DefaultButtonWidgetStyle(const DefaultButtonWidgetStyle&) = delete;
|
|
||||||
DefaultButtonWidgetStyle(DefaultButtonWidgetStyle&&) = default;
|
|
||||||
~DefaultButtonWidgetStyle() = default;
|
|
||||||
|
|
||||||
void Layout(const Vector2f& size) override;
|
|
||||||
|
|
||||||
void OnHoverBegin() override;
|
|
||||||
void OnHoverEnd() override;
|
|
||||||
void OnPress() override;
|
|
||||||
void OnRelease() override;
|
|
||||||
|
|
||||||
void UpdateText(const AbstractTextDrawer& drawer) override;
|
|
||||||
|
|
||||||
DefaultButtonWidgetStyle& operator=(const DefaultButtonWidgetStyle&) = delete;
|
|
||||||
DefaultButtonWidgetStyle& operator=(DefaultButtonWidgetStyle&&) = default;
|
|
||||||
|
|
||||||
private:
|
|
||||||
std::shared_ptr<Material> m_defaultMaterial;
|
|
||||||
std::shared_ptr<Material> m_pressedMaterial;
|
|
||||||
std::shared_ptr<SlicedSprite> m_sprite;
|
|
||||||
std::shared_ptr<TextSprite> m_textSprite;
|
|
||||||
entt::entity m_textEntity;
|
|
||||||
entt::entity m_gradientEntity;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#include <Nazara/Widgets/DefaultWidgetTheme.inl>
|
#include <Nazara/Widgets/DefaultWidgetTheme.inl>
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@
|
||||||
|
|
||||||
#include <Nazara/Graphics/TextSprite.hpp>
|
#include <Nazara/Graphics/TextSprite.hpp>
|
||||||
#include <Nazara/Widgets/BaseWidget.hpp>
|
#include <Nazara/Widgets/BaseWidget.hpp>
|
||||||
|
#include <Nazara/Widgets/WidgetTheme.hpp>
|
||||||
|
|
||||||
namespace Nz
|
namespace Nz
|
||||||
{
|
{
|
||||||
|
|
@ -23,14 +24,16 @@ namespace Nz
|
||||||
LabelWidget(LabelWidget&&) = default;
|
LabelWidget(LabelWidget&&) = default;
|
||||||
~LabelWidget() = default;
|
~LabelWidget() = default;
|
||||||
|
|
||||||
inline void UpdateText(const AbstractTextDrawer& drawer, float scale = 1.f);
|
void UpdateText(const AbstractTextDrawer& drawer, float scale = 1.f);
|
||||||
|
|
||||||
LabelWidget& operator=(const LabelWidget&) = delete;
|
LabelWidget& operator=(const LabelWidget&) = delete;
|
||||||
LabelWidget& operator=(LabelWidget&&) = default;
|
LabelWidget& operator=(LabelWidget&&) = default;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
entt::entity m_entity;
|
void OnMouseEnter() override;
|
||||||
std::shared_ptr<TextSprite> m_textSprite;
|
void OnMouseExit() override;
|
||||||
|
|
||||||
|
std::unique_ptr<LabelWidgetStyle> m_style;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,14 +7,6 @@
|
||||||
|
|
||||||
namespace Nz
|
namespace Nz
|
||||||
{
|
{
|
||||||
inline void LabelWidget::UpdateText(const AbstractTextDrawer& drawer, float scale)
|
|
||||||
{
|
|
||||||
m_textSprite->Update(drawer, scale);
|
|
||||||
|
|
||||||
Nz::Vector2f size = Nz::Vector2f(m_textSprite->GetAABB().GetLengths());
|
|
||||||
SetMinimumSize(size);
|
|
||||||
SetPreferredSize(size);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#include <Nazara/Widgets/DebugOff.hpp>
|
#include <Nazara/Widgets/DebugOff.hpp>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,84 @@
|
||||||
|
// Copyright (C) 2021 Jérôme "Lynix" Leclercq (lynix680@gmail.com)
|
||||||
|
// This file is part of the "Nazara Engine - Widgets module"
|
||||||
|
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#ifndef NAZARA_WIDGETS_SIMPLEWIDGETSTYLES_HPP
|
||||||
|
#define NAZARA_WIDGETS_SIMPLEWIDGETSTYLES_HPP
|
||||||
|
|
||||||
|
#include <Nazara/Graphics/SlicedSprite.hpp>
|
||||||
|
#include <Nazara/Graphics/TextSprite.hpp>
|
||||||
|
#include <Nazara/Widgets/WidgetTheme.hpp>
|
||||||
|
#include <entt/entt.hpp>
|
||||||
|
|
||||||
|
namespace Nz
|
||||||
|
{
|
||||||
|
class NAZARA_WIDGETS_API SimpleButtonWidgetStyle : public ButtonWidgetStyle
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
SimpleButtonWidgetStyle(ButtonWidget* buttonWidget, std::shared_ptr<Material> material, std::shared_ptr<Material> hoveredMaterial = {}, std::shared_ptr<Material> pressedMaterial = {}, std::shared_ptr<Material> pressedHoveredMaterial = {});
|
||||||
|
SimpleButtonWidgetStyle(const SimpleButtonWidgetStyle&) = delete;
|
||||||
|
SimpleButtonWidgetStyle(SimpleButtonWidgetStyle&&) = default;
|
||||||
|
~SimpleButtonWidgetStyle() = default;
|
||||||
|
|
||||||
|
void Layout(const Vector2f& size) override;
|
||||||
|
|
||||||
|
void OnHoverBegin() override;
|
||||||
|
void OnHoverEnd() override;
|
||||||
|
void OnPress() override;
|
||||||
|
void OnRelease() override;
|
||||||
|
|
||||||
|
void UpdateText(const AbstractTextDrawer& drawer) override;
|
||||||
|
|
||||||
|
SimpleButtonWidgetStyle& operator=(const SimpleButtonWidgetStyle&) = delete;
|
||||||
|
SimpleButtonWidgetStyle& operator=(SimpleButtonWidgetStyle&&) = default;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
virtual void UpdateMaterial(bool hovered, bool pressed);
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::shared_ptr<Material> m_hoveredMaterial;
|
||||||
|
std::shared_ptr<Material> m_material;
|
||||||
|
std::shared_ptr<Material> m_pressedMaterial;
|
||||||
|
std::shared_ptr<Material> m_pressedHoveredMaterial;
|
||||||
|
std::shared_ptr<SlicedSprite> m_sprite;
|
||||||
|
std::shared_ptr<TextSprite> m_textSprite;
|
||||||
|
entt::entity m_spriteEntity;
|
||||||
|
entt::entity m_textEntity;
|
||||||
|
bool m_isHovered;
|
||||||
|
bool m_isPressed;
|
||||||
|
};
|
||||||
|
|
||||||
|
class NAZARA_WIDGETS_API SimpleLabelWidgetStyle : public LabelWidgetStyle
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
SimpleLabelWidgetStyle(LabelWidget* labelWidget, std::shared_ptr<Material> material, std::shared_ptr<Material> hoveredMaterial = {});
|
||||||
|
SimpleLabelWidgetStyle(const SimpleLabelWidgetStyle&) = delete;
|
||||||
|
SimpleLabelWidgetStyle(SimpleLabelWidgetStyle&&) = default;
|
||||||
|
~SimpleLabelWidgetStyle() = default;
|
||||||
|
|
||||||
|
void Layout(const Vector2f& size) override;
|
||||||
|
|
||||||
|
void OnHoverBegin() override;
|
||||||
|
void OnHoverEnd() override;
|
||||||
|
|
||||||
|
void UpdateText(const AbstractTextDrawer& drawer) override;
|
||||||
|
|
||||||
|
SimpleLabelWidgetStyle& operator=(const SimpleLabelWidgetStyle&) = delete;
|
||||||
|
SimpleLabelWidgetStyle& operator=(SimpleLabelWidgetStyle&&) = default;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
virtual void UpdateMaterial(bool hovered);
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::shared_ptr<Material> m_hoveredMaterial;
|
||||||
|
std::shared_ptr<Material> m_material;
|
||||||
|
std::shared_ptr<TextSprite> m_textSprite;
|
||||||
|
entt::entity m_entity;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#include <Nazara/Widgets/DefaultWidgetTheme.inl>
|
||||||
|
|
||||||
|
#endif // NAZARA_WIDGETS_SIMPLEWIDGETSTYLES_HPP
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
// Copyright (C) 2021 Jérôme "Lynix" Leclercq (lynix680@gmail.com)
|
||||||
|
// This file is part of the "Nazara Engine - Widgets module"
|
||||||
|
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||||
|
|
||||||
|
#include <Nazara/Widgets/SimpleWidgetStyles.hpp>
|
||||||
|
#include <Nazara/Widgets/WidgetTheme.hpp>
|
||||||
|
#include <Nazara/Widgets/Debug.hpp>
|
||||||
|
|
||||||
|
namespace Nz
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
#include <Nazara/Widgets/DebugOff.hpp>
|
||||||
|
|
@ -17,6 +17,8 @@ namespace Nz
|
||||||
class AbstractTextDrawer;
|
class AbstractTextDrawer;
|
||||||
class ButtonWidget;
|
class ButtonWidget;
|
||||||
class ButtonWidgetStyle;
|
class ButtonWidgetStyle;
|
||||||
|
class LabelWidget;
|
||||||
|
class LabelWidgetStyle;
|
||||||
|
|
||||||
class NAZARA_WIDGETS_API WidgetTheme
|
class NAZARA_WIDGETS_API WidgetTheme
|
||||||
{
|
{
|
||||||
|
|
@ -27,6 +29,7 @@ namespace Nz
|
||||||
virtual ~WidgetTheme();
|
virtual ~WidgetTheme();
|
||||||
|
|
||||||
virtual std::unique_ptr<ButtonWidgetStyle> CreateStyle(ButtonWidget* buttonWidget) const = 0;
|
virtual std::unique_ptr<ButtonWidgetStyle> CreateStyle(ButtonWidget* buttonWidget) const = 0;
|
||||||
|
virtual std::unique_ptr<LabelWidgetStyle> CreateStyle(LabelWidget* buttonWidget) const = 0;
|
||||||
|
|
||||||
WidgetTheme& operator=(const WidgetTheme&) = delete;
|
WidgetTheme& operator=(const WidgetTheme&) = delete;
|
||||||
WidgetTheme& operator=(WidgetTheme&&) = default;
|
WidgetTheme& operator=(WidgetTheme&&) = default;
|
||||||
|
|
@ -43,6 +46,7 @@ namespace Nz
|
||||||
virtual ~BaseWidgetStyle();
|
virtual ~BaseWidgetStyle();
|
||||||
|
|
||||||
inline entt::entity CreateEntity();
|
inline entt::entity CreateEntity();
|
||||||
|
entt::entity CreateGraphicsEntity();
|
||||||
inline void DestroyEntity(entt::entity entity);
|
inline void DestroyEntity(entt::entity entity);
|
||||||
|
|
||||||
inline entt::registry& GetRegistry();
|
inline entt::registry& GetRegistry();
|
||||||
|
|
@ -75,7 +79,25 @@ namespace Nz
|
||||||
|
|
||||||
ButtonWidgetStyle& operator=(const ButtonWidgetStyle&) = delete;
|
ButtonWidgetStyle& operator=(const ButtonWidgetStyle&) = delete;
|
||||||
ButtonWidgetStyle& operator=(ButtonWidgetStyle&&) = default;
|
ButtonWidgetStyle& operator=(ButtonWidgetStyle&&) = default;
|
||||||
|
};
|
||||||
|
|
||||||
|
class NAZARA_WIDGETS_API LabelWidgetStyle : public BaseWidgetStyle
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
using BaseWidgetStyle::BaseWidgetStyle;
|
||||||
|
LabelWidgetStyle(const LabelWidgetStyle&) = delete;
|
||||||
|
LabelWidgetStyle(LabelWidgetStyle&&) = default;
|
||||||
|
~LabelWidgetStyle() = default;
|
||||||
|
|
||||||
|
virtual void Layout(const Vector2f& size) = 0;
|
||||||
|
|
||||||
|
virtual void OnHoverBegin();
|
||||||
|
virtual void OnHoverEnd();
|
||||||
|
|
||||||
|
virtual void UpdateText(const AbstractTextDrawer& drawer) = 0;
|
||||||
|
|
||||||
|
LabelWidgetStyle& operator=(const LabelWidgetStyle&) = delete;
|
||||||
|
LabelWidgetStyle& operator=(LabelWidgetStyle&&) = default;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,10 +6,7 @@
|
||||||
#include <Nazara/Graphics/BasicMaterial.hpp>
|
#include <Nazara/Graphics/BasicMaterial.hpp>
|
||||||
#include <Nazara/Graphics/Material.hpp>
|
#include <Nazara/Graphics/Material.hpp>
|
||||||
#include <Nazara/Graphics/MaterialPass.hpp>
|
#include <Nazara/Graphics/MaterialPass.hpp>
|
||||||
#include <Nazara/Graphics/Components/GraphicsComponent.hpp>
|
#include <Nazara/Widgets/SimpleWidgetStyles.hpp>
|
||||||
#include <Nazara/Utility/Components/NodeComponent.hpp>
|
|
||||||
#include <Nazara/Widgets/ButtonWidget.hpp>
|
|
||||||
#include <Nazara/Widgets/Canvas.hpp>
|
|
||||||
#include <Nazara/Widgets/Widgets.hpp>
|
#include <Nazara/Widgets/Widgets.hpp>
|
||||||
#include <Nazara/Widgets/Debug.hpp>
|
#include <Nazara/Widgets/Debug.hpp>
|
||||||
|
|
||||||
|
|
@ -21,9 +18,17 @@ namespace Nz
|
||||||
#include <Nazara/Widgets/Resources/DefaultStyle/Button.png.h>
|
#include <Nazara/Widgets/Resources/DefaultStyle/Button.png.h>
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const UInt8 ButtonHoveredImage[] = {
|
||||||
|
#include <Nazara/Widgets/Resources/DefaultStyle/ButtonHovered.png.h>
|
||||||
|
};
|
||||||
|
|
||||||
const UInt8 ButtonPressedImage[] = {
|
const UInt8 ButtonPressedImage[] = {
|
||||||
#include <Nazara/Widgets/Resources/DefaultStyle/ButtonPressed.png.h>
|
#include <Nazara/Widgets/Resources/DefaultStyle/ButtonPressed.png.h>
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const UInt8 ButtonPressedHoveredImage[] = {
|
||||||
|
#include <Nazara/Widgets/Resources/DefaultStyle/ButtonPressedHovered.png.h>
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
DefaultWidgetTheme::DefaultWidgetTheme()
|
DefaultWidgetTheme::DefaultWidgetTheme()
|
||||||
|
|
@ -32,90 +37,35 @@ namespace Nz
|
||||||
texParams.renderDevice = Graphics::Instance()->GetRenderDevice();
|
texParams.renderDevice = Graphics::Instance()->GetRenderDevice();
|
||||||
texParams.loadFormat = PixelFormat::RGBA8_SRGB;
|
texParams.loadFormat = PixelFormat::RGBA8_SRGB;
|
||||||
|
|
||||||
|
auto CreateMaterialFromTexture = [](std::shared_ptr<Texture> texture)
|
||||||
|
{
|
||||||
|
std::shared_ptr<MaterialPass> buttonMaterialPass = std::make_shared<MaterialPass>(BasicMaterial::GetSettings());
|
||||||
|
buttonMaterialPass->EnableDepthBuffer(true);
|
||||||
|
buttonMaterialPass->EnableDepthWrite(false);
|
||||||
|
|
||||||
|
std::shared_ptr<Material> material = std::make_shared<Material>();
|
||||||
|
material->AddPass("ForwardPass", buttonMaterialPass);
|
||||||
|
|
||||||
|
BasicMaterial buttonBasicMat(*buttonMaterialPass);
|
||||||
|
buttonBasicMat.SetDiffuseMap(texture);
|
||||||
|
|
||||||
|
return material;
|
||||||
|
};
|
||||||
|
|
||||||
// Button material
|
// Button material
|
||||||
{
|
m_buttonMaterial = CreateMaterialFromTexture(Texture::LoadFromMemory(ButtonImage, sizeof(ButtonImage), texParams));
|
||||||
std::shared_ptr<MaterialPass> buttonMaterialPass = std::make_shared<MaterialPass>(BasicMaterial::GetSettings());
|
m_hoveredButtonMaterial = CreateMaterialFromTexture(Texture::LoadFromMemory(ButtonHoveredImage, sizeof(ButtonHoveredImage), texParams));
|
||||||
buttonMaterialPass->EnableDepthBuffer(true);
|
m_pressedButtonMaterial = CreateMaterialFromTexture(Texture::LoadFromMemory(ButtonPressedImage, sizeof(ButtonPressedImage), texParams));
|
||||||
buttonMaterialPass->EnableDepthWrite(false);
|
m_pressedHoveredMaterial = CreateMaterialFromTexture(Texture::LoadFromMemory(ButtonPressedHoveredImage, sizeof(ButtonPressedHoveredImage), texParams));
|
||||||
|
|
||||||
m_buttonMaterial = std::make_shared<Material>();
|
|
||||||
m_buttonMaterial->AddPass("ForwardPass", buttonMaterialPass);
|
|
||||||
|
|
||||||
BasicMaterial buttonBasicMat(*buttonMaterialPass);
|
|
||||||
buttonBasicMat.SetDiffuseMap(Texture::LoadFromMemory(ButtonImage, sizeof(ButtonImage), texParams));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Button (pressed) material
|
|
||||||
{
|
|
||||||
std::shared_ptr<MaterialPass> buttonMaterialPass = std::make_shared<MaterialPass>(BasicMaterial::GetSettings());
|
|
||||||
buttonMaterialPass->EnableDepthBuffer(true);
|
|
||||||
buttonMaterialPass->EnableDepthWrite(false);
|
|
||||||
|
|
||||||
m_pressedButtonMaterial = std::make_shared<Material>();
|
|
||||||
m_pressedButtonMaterial->AddPass("ForwardPass", buttonMaterialPass);
|
|
||||||
|
|
||||||
BasicMaterial buttonBasicMat(*buttonMaterialPass);
|
|
||||||
buttonBasicMat.SetDiffuseMap(Texture::LoadFromMemory(ButtonPressedImage, sizeof(ButtonPressedImage), texParams));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<ButtonWidgetStyle> DefaultWidgetTheme::CreateStyle(ButtonWidget* buttonWidget) const
|
std::unique_ptr<ButtonWidgetStyle> DefaultWidgetTheme::CreateStyle(ButtonWidget* buttonWidget) const
|
||||||
{
|
{
|
||||||
return std::make_unique<DefaultButtonWidgetStyle>(buttonWidget, m_buttonMaterial, m_pressedButtonMaterial);
|
return std::make_unique<SimpleButtonWidgetStyle>(buttonWidget, m_buttonMaterial, m_hoveredButtonMaterial, m_pressedButtonMaterial, m_pressedHoveredMaterial);
|
||||||
}
|
}
|
||||||
|
|
||||||
DefaultButtonWidgetStyle::DefaultButtonWidgetStyle(ButtonWidget* buttonWidget, std::shared_ptr<Material> defaultMaterial, std::shared_ptr<Material> pressedMaterial) :
|
std::unique_ptr<LabelWidgetStyle> DefaultWidgetTheme::CreateStyle(LabelWidget* buttonWidget) const
|
||||||
ButtonWidgetStyle(buttonWidget),
|
|
||||||
m_defaultMaterial(std::move(defaultMaterial)),
|
|
||||||
m_pressedMaterial(std::move(pressedMaterial))
|
|
||||||
{
|
{
|
||||||
auto& registry = GetRegistry();
|
return std::make_unique<SimpleLabelWidgetStyle>(buttonWidget, Widgets::Instance()->GetTransparentMaterial());
|
||||||
UInt32 renderMask = GetRenderMask();
|
|
||||||
|
|
||||||
m_sprite = std::make_shared<SlicedSprite>(m_defaultMaterial);
|
|
||||||
|
|
||||||
m_gradientEntity = CreateEntity();
|
|
||||||
registry.emplace<NodeComponent>(m_gradientEntity).SetParent(buttonWidget);
|
|
||||||
registry.emplace<GraphicsComponent>(m_gradientEntity).AttachRenderable(m_sprite, renderMask);
|
|
||||||
|
|
||||||
m_textSprite = std::make_shared<TextSprite>(Widgets::Instance()->GetTransparentMaterial());
|
|
||||||
|
|
||||||
m_textEntity = CreateEntity();
|
|
||||||
registry.emplace<NodeComponent>(m_textEntity).SetParent(buttonWidget);
|
|
||||||
registry.emplace<GraphicsComponent>(m_textEntity).AttachRenderable(m_textSprite, renderMask);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DefaultButtonWidgetStyle::Layout(const Vector2f& size)
|
|
||||||
{
|
|
||||||
m_sprite->SetSize(size);
|
|
||||||
|
|
||||||
entt::registry& registry = GetRegistry();
|
|
||||||
|
|
||||||
Boxf textBox = m_textSprite->GetAABB();
|
|
||||||
registry.get<NodeComponent>(m_textEntity).SetPosition(size.x / 2.f - textBox.width / 2.f, size.y / 2.f - textBox.height / 2.f);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DefaultButtonWidgetStyle::OnHoverBegin()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void DefaultButtonWidgetStyle::OnHoverEnd()
|
|
||||||
{
|
|
||||||
m_sprite->SetMaterial(m_defaultMaterial);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DefaultButtonWidgetStyle::OnPress()
|
|
||||||
{
|
|
||||||
m_sprite->SetMaterial(m_pressedMaterial);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DefaultButtonWidgetStyle::OnRelease()
|
|
||||||
{
|
|
||||||
m_sprite->SetMaterial(m_defaultMaterial);
|
|
||||||
}
|
|
||||||
|
|
||||||
void DefaultButtonWidgetStyle::UpdateText(const AbstractTextDrawer& drawer)
|
|
||||||
{
|
|
||||||
m_textSprite->Update(drawer);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@
|
||||||
#include <Nazara/Widgets/LabelWidget.hpp>
|
#include <Nazara/Widgets/LabelWidget.hpp>
|
||||||
#include <Nazara/Graphics/BasicMaterial.hpp>
|
#include <Nazara/Graphics/BasicMaterial.hpp>
|
||||||
#include <Nazara/Graphics/Components/GraphicsComponent.hpp>
|
#include <Nazara/Graphics/Components/GraphicsComponent.hpp>
|
||||||
|
#include <Nazara/Utility/AbstractTextDrawer.hpp>
|
||||||
#include <Nazara/Utility/Components/NodeComponent.hpp>
|
#include <Nazara/Utility/Components/NodeComponent.hpp>
|
||||||
#include <Nazara/Widgets/Canvas.hpp>
|
#include <Nazara/Widgets/Canvas.hpp>
|
||||||
#include <Nazara/Widgets/Widgets.hpp>
|
#include <Nazara/Widgets/Widgets.hpp>
|
||||||
|
|
@ -15,18 +16,29 @@ namespace Nz
|
||||||
LabelWidget::LabelWidget(BaseWidget* parent) :
|
LabelWidget::LabelWidget(BaseWidget* parent) :
|
||||||
BaseWidget(parent)
|
BaseWidget(parent)
|
||||||
{
|
{
|
||||||
m_textSprite = std::make_shared<TextSprite>(Widgets::Instance()->GetTransparentMaterial());
|
m_style = GetTheme()->CreateStyle(this);
|
||||||
|
|
||||||
auto& registry = GetRegistry();
|
|
||||||
|
|
||||||
m_entity = CreateEntity();
|
|
||||||
|
|
||||||
auto& gfxComponent = registry.emplace<GraphicsComponent>(m_entity, IsVisible());
|
|
||||||
gfxComponent.AttachRenderable(m_textSprite, GetCanvas()->GetRenderMask());
|
|
||||||
|
|
||||||
auto& nodeComponent = registry.emplace<NodeComponent>(m_entity);
|
|
||||||
nodeComponent.SetParent(this);
|
|
||||||
|
|
||||||
Layout();
|
Layout();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LabelWidget::UpdateText(const AbstractTextDrawer& drawer, float scale)
|
||||||
|
{
|
||||||
|
m_style->UpdateText(drawer);
|
||||||
|
|
||||||
|
Vector2f size(drawer.GetBounds().GetLengths());
|
||||||
|
SetMinimumSize(size);
|
||||||
|
SetPreferredSize(size + Vector2f(20.f, 10.f));
|
||||||
|
|
||||||
|
Layout();
|
||||||
|
}
|
||||||
|
|
||||||
|
void LabelWidget::OnMouseEnter()
|
||||||
|
{
|
||||||
|
m_style->OnHoverBegin();
|
||||||
|
}
|
||||||
|
|
||||||
|
void LabelWidget::OnMouseExit()
|
||||||
|
{
|
||||||
|
m_style->OnHoverEnd();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,138 @@
|
||||||
|
// Copyright (C) 2021 Jérôme "Lynix" Leclercq (lynix680@gmail.com)
|
||||||
|
// This file is part of the "Nazara Engine - Widgets module"
|
||||||
|
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||||
|
|
||||||
|
#include <Nazara/Widgets/SimpleWidgetStyles.hpp>
|
||||||
|
#include <Nazara/Graphics/Components/GraphicsComponent.hpp>
|
||||||
|
#include <Nazara/Utility/Components/NodeComponent.hpp>
|
||||||
|
#include <Nazara/Widgets/ButtonWidget.hpp>
|
||||||
|
#include <Nazara/Widgets/Canvas.hpp>
|
||||||
|
#include <Nazara/Widgets/LabelWidget.hpp>
|
||||||
|
#include <Nazara/Widgets/Widgets.hpp>
|
||||||
|
#include <Nazara/Widgets/Debug.hpp>
|
||||||
|
|
||||||
|
namespace Nz
|
||||||
|
{
|
||||||
|
SimpleButtonWidgetStyle::SimpleButtonWidgetStyle(ButtonWidget* buttonWidget, std::shared_ptr<Material> material, std::shared_ptr<Material> hoveredMaterial, std::shared_ptr<Material> pressedMaterial, std::shared_ptr<Material> pressedHoveredMaterial) :
|
||||||
|
ButtonWidgetStyle(buttonWidget),
|
||||||
|
m_hoveredMaterial(std::move(hoveredMaterial)),
|
||||||
|
m_material(std::move(material)),
|
||||||
|
m_pressedMaterial(std::move(pressedMaterial)),
|
||||||
|
m_pressedHoveredMaterial(std::move(pressedHoveredMaterial)),
|
||||||
|
m_isHovered(false),
|
||||||
|
m_isPressed(false)
|
||||||
|
{
|
||||||
|
assert(m_material);
|
||||||
|
|
||||||
|
auto& registry = GetRegistry();
|
||||||
|
UInt32 renderMask = GetRenderMask();
|
||||||
|
|
||||||
|
m_sprite = std::make_shared<SlicedSprite>(m_material);
|
||||||
|
m_textSprite = std::make_shared<TextSprite>(Widgets::Instance()->GetTransparentMaterial());
|
||||||
|
|
||||||
|
m_spriteEntity = CreateGraphicsEntity();
|
||||||
|
registry.get<GraphicsComponent>(m_spriteEntity).AttachRenderable(m_sprite, renderMask);
|
||||||
|
|
||||||
|
m_textEntity = CreateGraphicsEntity();
|
||||||
|
registry.get<GraphicsComponent>(m_textEntity).AttachRenderable(m_textSprite, renderMask);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleButtonWidgetStyle::Layout(const Vector2f& size)
|
||||||
|
{
|
||||||
|
m_sprite->SetSize(size);
|
||||||
|
|
||||||
|
entt::registry& registry = GetRegistry();
|
||||||
|
|
||||||
|
Boxf textBox = m_textSprite->GetAABB();
|
||||||
|
registry.get<NodeComponent>(m_textEntity).SetPosition(size.x / 2.f - textBox.width / 2.f, size.y / 2.f - textBox.height / 2.f);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleButtonWidgetStyle::OnHoverBegin()
|
||||||
|
{
|
||||||
|
m_isHovered = true;
|
||||||
|
UpdateMaterial(m_isHovered, m_isPressed);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleButtonWidgetStyle::OnHoverEnd()
|
||||||
|
{
|
||||||
|
m_isHovered = false;
|
||||||
|
UpdateMaterial(m_isHovered, m_isPressed);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleButtonWidgetStyle::OnPress()
|
||||||
|
{
|
||||||
|
m_isPressed = true;
|
||||||
|
UpdateMaterial(m_isHovered, m_isPressed);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleButtonWidgetStyle::OnRelease()
|
||||||
|
{
|
||||||
|
m_isPressed = false;
|
||||||
|
UpdateMaterial(m_isHovered, m_isPressed);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleButtonWidgetStyle::UpdateText(const AbstractTextDrawer& drawer)
|
||||||
|
{
|
||||||
|
m_textSprite->Update(drawer);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleButtonWidgetStyle::UpdateMaterial(bool hovered, bool pressed)
|
||||||
|
{
|
||||||
|
if (pressed && hovered && m_pressedHoveredMaterial)
|
||||||
|
m_sprite->SetMaterial(m_pressedHoveredMaterial);
|
||||||
|
else if (pressed && m_pressedMaterial)
|
||||||
|
m_sprite->SetMaterial(m_pressedMaterial);
|
||||||
|
else if (hovered && m_hoveredMaterial)
|
||||||
|
m_sprite->SetMaterial(m_hoveredMaterial);
|
||||||
|
else
|
||||||
|
m_sprite->SetMaterial(m_material);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
SimpleLabelWidgetStyle::SimpleLabelWidgetStyle(LabelWidget* labelWidget, std::shared_ptr<Material> material, std::shared_ptr<Material> hoveredMaterial) :
|
||||||
|
LabelWidgetStyle(labelWidget),
|
||||||
|
m_hoveredMaterial(std::move(hoveredMaterial)),
|
||||||
|
m_material(std::move(material))
|
||||||
|
{
|
||||||
|
assert(m_material);
|
||||||
|
|
||||||
|
auto& registry = GetRegistry();
|
||||||
|
UInt32 renderMask = GetRenderMask();
|
||||||
|
|
||||||
|
m_textSprite = std::make_shared<TextSprite>(m_material);
|
||||||
|
|
||||||
|
m_entity = CreateGraphicsEntity();
|
||||||
|
registry.get<GraphicsComponent>(m_entity).AttachRenderable(m_textSprite, renderMask);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleLabelWidgetStyle::Layout(const Vector2f& size)
|
||||||
|
{
|
||||||
|
entt::registry& registry = GetRegistry();
|
||||||
|
|
||||||
|
Boxf textBox = m_textSprite->GetAABB();
|
||||||
|
registry.get<NodeComponent>(m_entity).SetPosition(size.x / 2.f - textBox.width / 2.f, size.y / 2.f - textBox.height / 2.f);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleLabelWidgetStyle::OnHoverBegin()
|
||||||
|
{
|
||||||
|
UpdateMaterial(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleLabelWidgetStyle::OnHoverEnd()
|
||||||
|
{
|
||||||
|
UpdateMaterial(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleLabelWidgetStyle::UpdateMaterial(bool hovered)
|
||||||
|
{
|
||||||
|
if (hovered && m_hoveredMaterial)
|
||||||
|
m_textSprite->SetMaterial(m_hoveredMaterial);
|
||||||
|
else
|
||||||
|
m_textSprite->SetMaterial(m_material);
|
||||||
|
}
|
||||||
|
|
||||||
|
void SimpleLabelWidgetStyle::UpdateText(const AbstractTextDrawer& drawer)
|
||||||
|
{
|
||||||
|
m_textSprite->Update(drawer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -3,6 +3,8 @@
|
||||||
// For conditions of distribution and use, see copyright notice in Config.hpp
|
// For conditions of distribution and use, see copyright notice in Config.hpp
|
||||||
|
|
||||||
#include <Nazara/Widgets/WidgetTheme.hpp>
|
#include <Nazara/Widgets/WidgetTheme.hpp>
|
||||||
|
#include <Nazara/Graphics/Components/GraphicsComponent.hpp>
|
||||||
|
#include <Nazara/Utility/Components/NodeComponent.hpp>
|
||||||
#include <Nazara/Widgets/Canvas.hpp>
|
#include <Nazara/Widgets/Canvas.hpp>
|
||||||
#include <Nazara/Widgets/Debug.hpp>
|
#include <Nazara/Widgets/Debug.hpp>
|
||||||
|
|
||||||
|
|
@ -12,11 +14,23 @@ namespace Nz
|
||||||
|
|
||||||
BaseWidgetStyle::~BaseWidgetStyle() = default;
|
BaseWidgetStyle::~BaseWidgetStyle() = default;
|
||||||
|
|
||||||
|
entt::entity BaseWidgetStyle::CreateGraphicsEntity()
|
||||||
|
{
|
||||||
|
auto& registry = GetRegistry();
|
||||||
|
|
||||||
|
entt::entity entity = CreateEntity();
|
||||||
|
registry.emplace<GraphicsComponent>(entity, m_widgetOwner->IsVisible());
|
||||||
|
registry.emplace<NodeComponent>(entity).SetParent(m_widgetOwner);
|
||||||
|
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
UInt32 BaseWidgetStyle::GetRenderMask() const
|
UInt32 BaseWidgetStyle::GetRenderMask() const
|
||||||
{
|
{
|
||||||
return m_widgetOwner->GetCanvas()->GetRenderMask();
|
return m_widgetOwner->GetCanvas()->GetRenderMask();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ButtonWidgetStyle::OnHoverBegin()
|
void ButtonWidgetStyle::OnHoverBegin()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
@ -32,4 +46,13 @@ namespace Nz
|
||||||
void ButtonWidgetStyle::OnRelease()
|
void ButtonWidgetStyle::OnRelease()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void LabelWidgetStyle::OnHoverBegin()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void LabelWidgetStyle::OnHoverEnd()
|
||||||
|
{
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue