Major refactoring but now centering text and sprites works. See Issue #16 for why only those and not anything else yet.
This commit is contained in:
parent
2c22da022f
commit
9e9b9620c9
6 changed files with 47 additions and 92 deletions
|
@ -10,7 +10,7 @@
|
|||
namespace guecs {
|
||||
using std::shared_ptr, std::wstring, std::string;
|
||||
|
||||
struct Textual {
|
||||
struct Text {
|
||||
std::wstring content;
|
||||
unsigned int size = THEME.TEXT_SIZE;
|
||||
sf::Color color = THEME.TEXT_COLOR;
|
||||
|
@ -24,19 +24,6 @@ namespace guecs {
|
|||
void render(sf::RenderWindow& window, sf::Shader *shader_ptr);
|
||||
};
|
||||
|
||||
struct Label : public Textual {
|
||||
template<typename... Args>
|
||||
Label(Args... args) : Textual(args...)
|
||||
{
|
||||
centered = true;
|
||||
size = THEME.LABEL_SIZE;
|
||||
}
|
||||
|
||||
Label() {
|
||||
centered = true;
|
||||
};
|
||||
};
|
||||
|
||||
struct Sprite {
|
||||
string name;
|
||||
int padding = THEME.PADDING;
|
||||
|
@ -49,20 +36,6 @@ namespace guecs {
|
|||
void render(sf::RenderWindow& window, sf::Shader *shader_ptr);
|
||||
};
|
||||
|
||||
struct Icon : public Sprite {
|
||||
template<typename... Args>
|
||||
Icon(Args... args) : Sprite(args...)
|
||||
{
|
||||
stretch = false;
|
||||
is_icon = true;
|
||||
}
|
||||
|
||||
Icon() {
|
||||
// BUG: why do I have to do this again?
|
||||
stretch = false;
|
||||
};
|
||||
};
|
||||
|
||||
struct Rectangle {
|
||||
int padding = THEME.PADDING;
|
||||
sf::Color color = THEME.FILL_COLOR;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue