diff options
| author | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-17 13:36:35 +0100 |
|---|---|---|
| committer | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-12-17 13:36:35 +0100 |
| commit | 31fe4b1d44a7a7114c7ef8c0c5310a6070214cb2 (patch) | |
| tree | 14564711f3ce996ccb1000e3f4f07d265e6fab88 /src/crepe/api/Text.cpp | |
| parent | 0c02511f6a64766174cb0db3beb4cc159d3efdf7 (diff) | |
| parent | 69ca7fdd738fd4ed98aefc07bab5a43486a55619 (diff) | |
Merge branch 'wouter/text-component' into niels/UI
Diffstat (limited to 'src/crepe/api/Text.cpp')
| -rw-r--r-- | src/crepe/api/Text.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp index 1620247..2e248de 100644 --- a/src/crepe/api/Text.cpp +++ b/src/crepe/api/Text.cpp @@ -5,11 +5,11 @@ using namespace crepe; -Text::Text(game_object_id_t id, const vec2 & dimensions,const vec2 & offset, const std::string & font_family, - const Data & data, const std::string & text, std::optional<Asset> font) +Text::Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset, + const std::string & font_family, const Data & data, const std::string & text, + std::optional<Asset> font) : UIObject(id, dimensions, offset), text(text), data(data), font_family(font_family), - font(font) { -} + font(font) {} |