-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use Rgb instead of Color for Label ctor
- Loading branch information
Showing
2 changed files
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
// Copyright 2020-2022 Jan Niklas Hasse <[email protected]> | ||
// Copyright 2020-2024 Jan Niklas Hasse <[email protected]> | ||
// For conditions of distribution and use, see copyright notice in LICENSE.txt | ||
/// Contains jngl::Label class | ||
/// @file | ||
#pragma once | ||
|
||
#include "Color.hpp" | ||
#include "Rgb.hpp" | ||
#include "TextLine.hpp" | ||
#include "Widget.hpp" | ||
#include "text.hpp" | ||
|
@@ -14,7 +14,7 @@ namespace jngl { | |
/// Simple Widget displaying a line of text | ||
class Label : public Widget { | ||
public: | ||
explicit Label(const std::string& str, Font&, Color, Vec2 position); | ||
explicit Label(const std::string& str, Font&, Rgb, Vec2 position); | ||
|
||
void drawSelf(jngl::Mat3) const override; | ||
|
||
|
@@ -32,7 +32,7 @@ class Label : public Widget { | |
|
||
private: | ||
jngl::TextLine text; | ||
jngl::Color color; | ||
jngl::Rgb color; | ||
}; | ||
|
||
} // namespace jngl |