sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Widgets: Add ProgressBarWidget

Browse Source
This commit is contained in:
SirLynix
2024-01-16 14:13:06 +01:00
parent c8776bc950
commit 964d32b34e
11 changed files with 249 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/Nazara/Widgets.hpp
View File

@@ -41,6 +41,7 @@
#include <Nazara/Widgets/ImageButtonWidget.hpp>
#include <Nazara/Widgets/ImageWidget.hpp>
#include <Nazara/Widgets/LabelWidget.hpp>
#include <Nazara/Widgets/ProgressBarWidget.hpp>
#include <Nazara/Widgets/RichTextAreaWidget.hpp>
#include <Nazara/Widgets/ScrollAreaWidget.hpp>
#include <Nazara/Widgets/ScrollbarButtonWidget.hpp>

2
include/Nazara/Widgets/DefaultWidgetTheme.hpp
View File

@@ -26,6 +26,7 @@ namespace Nz
std::unique_ptr<CheckboxWidgetStyle> CreateStyle(CheckboxWidget* checkboxWidget) const override;
std::unique_ptr<ImageButtonWidgetStyle> CreateStyle(ImageButtonWidget* imageButtonWidget) const override;
std::unique_ptr<LabelWidgetStyle> CreateStyle(LabelWidget* labelWidget) const override;
std::unique_ptr<ProgressBarWidgetStyle> CreateStyle(ProgressBarWidget* progressBarWidget) const override;
std::unique_ptr<ScrollAreaWidgetStyle> CreateStyle(ScrollAreaWidget* scrollAreaWidget) const override;
std::unique_ptr<ScrollbarWidgetStyle> CreateStyle(ScrollbarWidget* scrollbarWidget) const override;
std::unique_ptr<ScrollbarButtonWidgetStyle> CreateStyle(ScrollbarButtonWidget* scrollbarButtonWidget) const override;
@@ -43,6 +44,7 @@ namespace Nz
std::shared_ptr<MaterialInstance> m_checkboxCheckMaterial;
std::shared_ptr<MaterialInstance> m_checkboxTristateMaterial;
std::shared_ptr<MaterialInstance> m_hoveredMaterial;
std::shared_ptr<MaterialInstance> m_progressBarMaterial;
std::shared_ptr<MaterialInstance> m_scrollbarBackgroundHorizontalMaterial;
std::shared_ptr<MaterialInstance> m_scrollbarBackgroundVerticalMaterial;
std::shared_ptr<MaterialInstance> m_scrollbarButtonMaterial;

43
include/Nazara/Widgets/ProgressBarWidget.hpp Normal file
View File

@@ -0,0 +1,43 @@
// Copyright (C) 2024 Jérôme "SirLynix" 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_PROGRESSBARWIDGET_HPP
#define NAZARA_WIDGETS_PROGRESSBARWIDGET_HPP
#include <NazaraUtils/Prerequisites.hpp>
#include <Nazara/Widgets/BaseWidget.hpp>
#include <Nazara/Widgets/WidgetTheme.hpp>
namespace Nz
{
class NAZARA_WIDGETS_API ProgressBarWidget : public BaseWidget
{
public:
ProgressBarWidget(BaseWidget* parent);
ProgressBarWidget(const ProgressBarWidget&) = delete;
ProgressBarWidget(ProgressBarWidget&&) = delete;
~ProgressBarWidget() = default;
inline float GetFraction() const;
void Layout() override;
void OnRenderLayerUpdated(int baseRenderLayer) override;
inline void SetFraction(float fraction);
ProgressBarWidget& operator=(const ProgressBarWidget&) = delete;
ProgressBarWidget& operator=(ProgressBarWidget&&) = delete;
private:
std::unique_ptr<ProgressBarWidgetStyle> m_style;
float m_fraction;
};
}
#include <Nazara/Widgets/ProgressBarWidget.inl>
#endif // NAZARA_WIDGETS_PROGRESSBARWIDGET_HPP

23
include/Nazara/Widgets/ProgressBarWidget.inl Normal file
View File

@@ -0,0 +1,23 @@
// Copyright (C) 2024 Jérôme "SirLynix" 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/ProgressBarWidget.hpp>
#include <algorithm>
#include <Nazara/Widgets/Debug.hpp>
namespace Nz
{
inline float ProgressBarWidget::GetFraction() const
{
return m_fraction;
}
inline void ProgressBarWidget::SetFraction(float fraction)
{
m_fraction = std::clamp(fraction, 0.f, 1.f);
Layout();
}
}
#include <Nazara/Widgets/DebugOff.hpp>

38
include/Nazara/Widgets/SimpleWidgetStyles.hpp
View File

@@ -179,6 +179,44 @@ namespace Nz
std::shared_ptr<TextSprite> m_textSprite;
entt::entity m_entity;
};
class NAZARA_WIDGETS_API SimpleProgressBarWidgetStyle : public ProgressBarWidgetStyle
{
public:
struct StyleConfig;
SimpleProgressBarWidgetStyle(ProgressBarWidget* progressBarWidget, StyleConfig styleConfig);
SimpleProgressBarWidgetStyle(const SimpleProgressBarWidgetStyle&) = delete;
SimpleProgressBarWidgetStyle(SimpleProgressBarWidgetStyle&&) = default;
~SimpleProgressBarWidgetStyle() = default;
void Layout(const Vector2f& size) override;
void UpdateRenderLayer(int baseRenderLayer) override;
SimpleProgressBarWidgetStyle& operator=(const SimpleProgressBarWidgetStyle&) = delete;
SimpleProgressBarWidgetStyle& operator=(SimpleProgressBarWidgetStyle&&) = default;
struct StyleConfig
{
std::shared_ptr<MaterialInstance> backgroundMaterial;
Color progressBarBeginColor;
Color progressBarEndColor;
float backgroundCornerSize;
float backgroundCornerTexCoords;
float barOffset;
};
private:
std::shared_ptr<MaterialInstance> m_backgroundMaterial;
std::shared_ptr<SlicedSprite> m_backgroundSprite;
std::shared_ptr<Sprite> m_progressBarSprite;
entt::entity m_backgroundEntity;
entt::entity m_barEntity;
Color m_progressBarBeginColor;
Color m_progressBarEndColor;
float m_barOffset;
};
class NAZARA_WIDGETS_API SimpleScrollAreaWidgetStyle : public ScrollAreaWidgetStyle
{

17
include/Nazara/Widgets/WidgetTheme.hpp
View File

@@ -24,6 +24,8 @@ namespace Nz
class ImageButtonWidgetStyle;
class LabelWidget;
class LabelWidgetStyle;
class ProgressBarWidget;
class ProgressBarWidgetStyle;
class ScrollAreaWidget;
class ScrollAreaWidgetStyle;
class ScrollbarWidget;
@@ -45,6 +47,7 @@ namespace Nz
virtual std::unique_ptr<CheckboxWidgetStyle> CreateStyle(CheckboxWidget* checkboxWidget) const = 0;
virtual std::unique_ptr<ImageButtonWidgetStyle> CreateStyle(ImageButtonWidget* imageButtonWidget) const = 0;
virtual std::unique_ptr<LabelWidgetStyle> CreateStyle(LabelWidget* labelWidget) const = 0;
virtual std::unique_ptr<ProgressBarWidgetStyle> CreateStyle(ProgressBarWidget* labelWidget) const = 0;
virtual std::unique_ptr<ScrollAreaWidgetStyle> CreateStyle(ScrollAreaWidget* scrollareaWidget) const = 0;
virtual std::unique_ptr<ScrollbarWidgetStyle> CreateStyle(ScrollbarWidget* scrollbarWidget) const = 0;
virtual std::unique_ptr<ScrollbarButtonWidgetStyle> CreateStyle(ScrollbarButtonWidget* scrollbarButtonWidget) const = 0;
@@ -183,6 +186,20 @@ namespace Nz
LabelWidgetStyle& operator=(const LabelWidgetStyle&) = delete;
LabelWidgetStyle& operator=(LabelWidgetStyle&&) = default;
};
class NAZARA_WIDGETS_API ProgressBarWidgetStyle : public BaseWidgetStyle
{
public:
using BaseWidgetStyle::BaseWidgetStyle;
ProgressBarWidgetStyle(const ProgressBarWidgetStyle&) = delete;
ProgressBarWidgetStyle(ProgressBarWidgetStyle&&) = default;
~ProgressBarWidgetStyle() = default;
virtual void Layout(const Vector2f& size) = 0;
ProgressBarWidgetStyle& operator=(const ProgressBarWidgetStyle&) = delete;
ProgressBarWidgetStyle& operator=(ProgressBarWidgetStyle&&) = default;
};
class NAZARA_WIDGETS_API ScrollAreaWidgetStyle : public BaseWidgetStyle
{