Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved the Alignment enumerator from Font to GuiComponent.

Browse source
This commit is contained in:
Leon Styhre 2022-09-07 19:54:55 +02:00
parent 503ff07d81
commit 8361c4f15c
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
es-core/src/GuiComponent.h
View file

@ -34,6 +34,14 @@ class InputConfig;
class ThemeData; class ThemeData;
class Window; class Window;
enum Alignment {
ALIGN_LEFT,
ALIGN_CENTER, // Used for both horizontal and vertical alignments.
ALIGN_RIGHT,
ALIGN_TOP,
ALIGN_BOTTOM
};
class GuiComponent class GuiComponent
{ {
public: public:

9
es-core/src/resources/Font.h
View file

@ -10,6 +10,7 @@
#ifndef ES_CORE_RESOURCES_FONT_H #ifndef ES_CORE_RESOURCES_FONT_H
#define ES_CORE_RESOURCES_FONT_H #define ES_CORE_RESOURCES_FONT_H
#include "GuiComponent.h"
#include "ThemeData.h" #include "ThemeData.h"
#include "renderers/Renderer.h" #include "renderers/Renderer.h"
#include "resources/ResourceManager.h" #include "resources/ResourceManager.h"
@ -35,14 +36,6 @@ class TextCache;
#define FONT_PATH_REGULAR ":/fonts/Akrobat-SemiBold.ttf" #define FONT_PATH_REGULAR ":/fonts/Akrobat-SemiBold.ttf"
#define FONT_PATH_BOLD ":/fonts/Akrobat-Bold.ttf" #define FONT_PATH_BOLD ":/fonts/Akrobat-Bold.ttf"
enum Alignment {
ALIGN_LEFT,
ALIGN_CENTER, // Used for both horizontal and vertical alignments.
ALIGN_RIGHT,
ALIGN_TOP,
ALIGN_BOTTOM
};
// A TrueType Font renderer that uses FreeType and OpenGL. // A TrueType Font renderer that uses FreeType and OpenGL.
// The library is automatically initialized when it's needed. // The library is automatically initialized when it's needed.
class Font : public IReloadable class Font : public IReloadable