Skip to content

Commit

Permalink
Merge pull request #31 from Neko-Box-Coder/UpdateStandardButtonAndDro…
Browse files Browse the repository at this point in the history 
…pdown

Updating Standard Button and Dropdown
  • Loading branch information
@Neko-Box-Coder
Neko-Box-Coder authored Oct 26, 2023
2 parents a8d4ff4 + 036fa71 commit 2080d57
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 143 deletions.
23 changes: 3 additions & 20 deletions Include/ssGUI/GUIObjectClasses/CompositeClasses/StandardButton.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,15 +165,6 @@ namespace ssGUI
*/
class StandardButton : public Button
{
public:
//Enum: ssGUI::StandardButton::Mode
enum class Mode
{
TEXT,
ICON,
BOTH
};

private:
StandardButton& operator=(StandardButton const& other) = default;

Expand All @@ -183,14 +174,14 @@ namespace ssGUI
bool AdaptiveButtonTextColor; //See <IsAdaptiveButtonTextColor>
glm::ivec4 ButtonTextColorDifference; //See <GetAdaptiveButtonTextColorDifference>
bool AdaptiveButtonTextContrast; //See <IsAdaptiveButtonTextContrast>
Mode ButtonMode; //See <GetButtonMode>

ssGUIObjectIndex ButtonImageWrapper; //(Internal variable) Allow the button image's size to be set by AdvancedSize

StandardButton(StandardButton const& other);

virtual void UpdateButtonText(bool init);
virtual void UpdateButtonImage(bool init);
virtual void UpdateButtonText();
virtual void UpdateButtonImage();
virtual glm::u8vec4 GetAdaptiveTextColor() const;

public:
//string: ListenerKey
Expand Down Expand Up @@ -245,14 +236,6 @@ namespace ssGUI
//Gets the button text color difference to button color (ButtonTextColor-ButtonColor)
virtual glm::ivec4 GetAdaptiveButtonTextColorDifference() const;

//function: SetButtonMode
//Sets the button mode for displaying text or icon or both
virtual void SetButtonMode(Mode buttonMode);

//function: GetButtonMode
//Gets the button mode for displaying text or icon or both
virtual Mode GetButtonMode() const;

//function: SetButtonColor
//See <Button::SetButtonColor>
virtual void SetButtonColor(glm::u8vec4 color) override;
Expand Down
8 changes: 6 additions & 2 deletions Src/ssGUI/GUIObjectClasses/CompositeClasses/Dropdown.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ namespace ssGUI
ChangeChildOrderToAfterPosition(firstIt, lastIt);

//Swap size multiplier
SetButtonMode(ssGUI::StandardButton::Mode::BOTH);
//SetButtonMode(ssGUI::StandardButton::Mode::BOTH);
auto layout = GetExtension<ssGUI::Extensions::Layout>();
float iconMulti = layout->GetPreferredSizeMultiplier(0);
float textMulti = layout->GetPreferredSizeMultiplier(1);
Expand All @@ -87,7 +87,11 @@ namespace ssGUI
InitiateDefaultResources();
//Set icon to dropdown arrow
if(DefaultDropdownArrowImageData != nullptr)
GetButtonIconObject()->SetImageData(DefaultDropdownArrowImageData);
{
auto* dropdownIcon = AddChild<ssGUI::Image>();
dropdownIcon->SetImageData(DefaultDropdownArrowImageData);
SetButtonIconObject(dropdownIcon);
}

//Create dropdown menu
auto dropdownMenu = ssGUI::Factory::Create<ssGUI::Menu>();
Expand Down
183 changes: 62 additions & 121 deletions Src/ssGUI/GUIObjectClasses/CompositeClasses/StandardButton.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,82 +20,84 @@ namespace ssGUI
AdaptiveButtonTextColor = other.IsAdaptiveButtonTextColor();
ButtonTextColorDifference = other.GetAdaptiveButtonTextColorDifference();
AdaptiveButtonTextContrast = other.IsAdaptiveButtonTextContrast();
ButtonMode = other.GetButtonMode();
//ButtonMode = other.GetButtonMode();
ButtonImageWrapper = other.ButtonImageWrapper;
}

void StandardButton::UpdateButtonText(bool init)
void StandardButton::UpdateButtonText()
{
ssGUI_LOG_FUNC();
auto buttonTextObj = CurrentObjectsReferences.GetObjectReference(ButtonText);
auto* buttonTextObj = CurrentObjectsReferences.GetObjectReference(ButtonText);
if(buttonTextObj == nullptr)
return;

if(GetButtonMode() == StandardButton::Mode::ICON)
{
buttonTextObj->SetEnabled(false);
return;
}

buttonTextObj->SetEnabled(true);
// if(!buttonTextObj->HasTag(ssGUI::Tags::FLOATING))
// buttonTextObj->AddTag(ssGUI::Tags::FLOATING);

// ssGUI::Extensions::AdvancedSize* as;
MoveChildToFirst(buttonTextObj);

// if(!buttonTextObj->GetExtension(ssGUI::Extensions::AdvancedSize::EXTENSION_NAME))
// buttonTextObj->AddExtension(ssGUI::Factory::Create<ssGUI::Extensions::AdvancedSize>());

if(init)
{
static_cast<ssGUI::Text*>(buttonTextObj)->SetTextHorizontalAlignment(ssGUI::Enums::AlignmentHorizontal::CENTER);
static_cast<ssGUI::Text*>(buttonTextObj)->SetTextVerticalAlignment(ssGUI::Enums::AlignmentVertical::CENTER);
}
static_cast<ssGUI::Text*>(buttonTextObj)->SetTextHorizontalAlignment(ssGUI::Enums::AlignmentHorizontal::CENTER);
static_cast<ssGUI::Text*>(buttonTextObj)->SetTextVerticalAlignment(ssGUI::Enums::AlignmentVertical::CENTER);
}

void StandardButton::UpdateButtonImage(bool init)
void StandardButton::UpdateButtonImage()
{
ssGUI_LOG_FUNC();
auto buttonImgObj = CurrentObjectsReferences.GetObjectReference(ButtonImage);
auto* buttonImgObj = CurrentObjectsReferences.GetObjectReference(ButtonImage);
if(buttonImgObj == nullptr)
return;

auto buttonImgWrapper = CurrentObjectsReferences.GetObjectReference(ButtonImageWrapper);
auto* buttonImgWrapper = CurrentObjectsReferences.GetObjectReference(ButtonImageWrapper);
if(buttonImgWrapper == nullptr)
return;

if(GetButtonMode() == StandardButton::Mode::TEXT)
{
buttonImgWrapper->SetEnabled(false);
return;
}

buttonImgWrapper->SetEnabled(true);
// if(!buttonImgWrapper->HasTag(ssGUI::Tags::FLOATING))
// buttonImgWrapper->AddTag(ssGUI::Tags::FLOATING);
MoveChildToFirst(buttonImgWrapper);

if(init)
{
ssGUI::Extensions::AdvancedSize* as;
ssGUI::Extensions::AdvancedPosition* ap;

if(!buttonImgObj->GetExtension<ssGUI::Extensions::AdvancedSize>())
buttonImgObj->AddExtension<ssGUI::Extensions::AdvancedSize>();
ssGUI::Extensions::AdvancedSize* as;
ssGUI::Extensions::AdvancedPosition* ap;

if(!buttonImgObj->GetExtension<ssGUI::Extensions::AdvancedSize>())
buttonImgObj->AddExtension<ssGUI::Extensions::AdvancedSize>();

as = buttonImgObj->GetExtension<ssGUI::Extensions::AdvancedSize>();
as = buttonImgObj->GetExtension<ssGUI::Extensions::AdvancedSize>();

as->SetHorizontalPercentage(0.55);
as->SetHorizontalPixel(0);
as->SetVerticalPercentage(0.55);
as->SetVerticalPixel(0);
as->SetHorizontalPercentage(0.55);
as->SetHorizontalPixel(0);
as->SetVerticalPercentage(0.55);
as->SetVerticalPixel(0);

if(!buttonImgObj->GetExtension<ssGUI::Extensions::AdvancedPosition>())
buttonImgObj->AddExtension<ssGUI::Extensions::AdvancedPosition>();
if(!buttonImgObj->GetExtension<ssGUI::Extensions::AdvancedPosition>())
buttonImgObj->AddExtension<ssGUI::Extensions::AdvancedPosition>();

ap = buttonImgObj->GetExtension<ssGUI::Extensions::AdvancedPosition>();
ap->SetHorizontalAlignment(ssGUI::Enums::AlignmentHorizontal::CENTER);
ap->SetVerticalAlignment(ssGUI::Enums::AlignmentVertical::CENTER);
}

ap = buttonImgObj->GetExtension<ssGUI::Extensions::AdvancedPosition>();
ap->SetHorizontalAlignment(ssGUI::Enums::AlignmentHorizontal::CENTER);
ap->SetVerticalAlignment(ssGUI::Enums::AlignmentVertical::CENTER);
glm::u8vec4 StandardButton::GetAdaptiveTextColor() const
{
glm::ivec4 textResult;

if(IsAdaptiveButtonTextContrast())
{
float averageButtonColor = (GetButtonColor().r + GetButtonColor().g + GetButtonColor().b) / (float)3;
float averageTextDiffColor = ( GetAdaptiveButtonTextColorDifference().r +
GetAdaptiveButtonTextColorDifference().g +
GetAdaptiveButtonTextColorDifference().b) / (float)3;

int contrastFactor = averageButtonColor + averageTextDiffColor > 255 ? -1 : 1;
textResult = (glm::ivec4)GetButtonColor() + GetAdaptiveButtonTextColorDifference() * contrastFactor;
}
else
textResult = (glm::ivec4)GetButtonColor() + GetAdaptiveButtonTextColorDifference();

textResult.r = textResult.r < 0 ? 0 : textResult.r;
textResult.r = textResult.r > 255 ? 255 : textResult.r;
textResult.g = textResult.g < 0 ? 0 : textResult.g;
textResult.g = textResult.g > 255 ? 255 : textResult.g;
textResult.b = textResult.b > 255 ? 255 : textResult.b;
textResult.b = textResult.b < 0 ? 0 : textResult.b;
textResult.a = textResult.a < 0 ? 0 : textResult.a;
textResult.a = textResult.a > 255 ? 255 : textResult.a;

return glm::u8vec4((uint8_t)textResult.r, (uint8_t)textResult.g, (uint8_t)textResult.b, (uint8_t)textResult.a);
}

const std::string StandardButton::ListenerKey = "Standard Button";
Expand All @@ -105,7 +107,6 @@ namespace ssGUI
AdaptiveButtonTextColor(true),
ButtonTextColorDifference(0, 0, 0, 0),
AdaptiveButtonTextContrast(true),
ButtonMode(StandardButton::Mode::TEXT),
ButtonImageWrapper(-1)
{
ssGUI_LOG_FUNC();
Expand All @@ -130,28 +131,9 @@ namespace ssGUI
layout->AddPreferredSizeMultiplier(0.25);
layout->AddPreferredSizeMultiplier(0.75);

//Add Button Image
auto wrapper = ssGUI::Factory::Create<ssGUI::Widget>();
wrapper->SetParent(this, true);
wrapper->SetBlockInput(false);
wrapper->SetUserCreated(false);
wrapper->SetBackgroundColor(glm::u8vec4(0, 0, 0, 25));
ButtonImageWrapper = CurrentObjectsReferences.AddObjectReference(wrapper);

auto buttonImage = new ssGUI::Image();
buttonImage->SetUserCreated(false);
buttonImage->SetHeapAllocated(true);
buttonImage->SetParent(wrapper);
buttonImage->SetMinSize(glm::vec2(5, 5));
buttonImage->SetBackgroundColor(glm::u8vec4(0, 0, 0, 0));
buttonImage->SetBlockInput(false);
ButtonImage = CurrentObjectsReferences.AddObjectReference(buttonImage);

//Add button text
auto buttonText = new ssGUI::Text();
auto* buttonText = AddChild<ssGUI::Text>(true);
buttonText->SetUserCreated(false);
buttonText->SetHeapAllocated(true);
buttonText->SetParent(this, true);
buttonText->SetMinSize(glm::vec2(5, 5));
buttonText->SetNewTextColor(glm::u8vec4(255, 255, 255, 255));
ButtonText = CurrentObjectsReferences.AddObjectReference(buttonText);
Expand Down Expand Up @@ -233,8 +215,8 @@ namespace ssGUI
}
);

UpdateButtonText(true);
UpdateButtonImage(true);
UpdateButtonText();
UpdateButtonImage();
NotifyButtonEventCallbackManually();
}

Expand Down Expand Up @@ -262,22 +244,14 @@ namespace ssGUI
auto buttonImgWrapper = CurrentObjectsReferences.GetObjectReference(ButtonImageWrapper);
if(buttonImgWrapper == nullptr)
{
ButtonImage = -1;
return;
buttonImgWrapper = AddChild<ssGUI::GUIObject>(true);
ButtonImageWrapper = CurrentObjectsReferences.AddObjectReference(buttonImgWrapper);
}

glm::vec2 globalPos = image->GetGlobalPosition();
image->SetParent(buttonImgWrapper, true);
image->SetGlobalPosition(globalPos);

ssGUIObjectIndex newImageIndex = CurrentObjectsReferences.GetObjectIndex(image);

if(newImageIndex != -1)
ButtonImage = newImageIndex;
else
ButtonImage = CurrentObjectsReferences.AddObjectReference(image);

UpdateButtonImage(false);
ButtonImage = CurrentObjectsReferences.AddObjectReference(image);
UpdateButtonImage();
}

ssGUI::Image* StandardButton::GetButtonIconObject() const
Expand Down Expand Up @@ -317,7 +291,7 @@ namespace ssGUI

text->SetText(oldText);

UpdateButtonText(false);
UpdateButtonText();
}

ssGUI::Text* StandardButton::GetButtonTextObject() const
Expand Down Expand Up @@ -367,18 +341,6 @@ namespace ssGUI
return ButtonTextColorDifference;
}

void StandardButton::SetButtonMode(Mode buttonMode)
{
ButtonMode = buttonMode;
UpdateButtonText(false);
UpdateButtonImage(false);
}

StandardButton::Mode StandardButton::GetButtonMode() const
{
return ButtonMode;
}

void StandardButton::SetButtonColor(glm::u8vec4 color)
{
Button::SetButtonColor(color);
Expand All @@ -392,28 +354,7 @@ namespace ssGUI
return;
}

glm::ivec4 textResult;

if(IsAdaptiveButtonTextContrast())
{
float averageButtonColor = (GetButtonColor().r + GetButtonColor().g + GetButtonColor().b) / (float)3;
float averageTextDiffColor = (GetAdaptiveButtonTextColorDifference().r + GetAdaptiveButtonTextColorDifference().g + GetAdaptiveButtonTextColorDifference().b) / (float)3;
int contrastFactor = averageButtonColor + averageTextDiffColor > 255 ? -1 : 1;
textResult = (glm::ivec4)GetButtonColor() + GetAdaptiveButtonTextColorDifference() * contrastFactor;
}
else
textResult = (glm::ivec4)color + GetAdaptiveButtonTextColorDifference();

textResult.r = textResult.r < 0 ? 0 : textResult.r;
textResult.r = textResult.r > 255 ? 255 : textResult.r;
textResult.g = textResult.g < 0 ? 0 : textResult.g;
textResult.g = textResult.g > 255 ? 255 : textResult.g;
textResult.b = textResult.b > 255 ? 255 : textResult.b;
textResult.b = textResult.b < 0 ? 0 : textResult.b;
textResult.a = textResult.a < 0 ? 0 : textResult.a;
textResult.a = textResult.a > 255 ? 255 : textResult.a;

GetButtonTextObject()->SetNewTextColor(glm::u8vec4((uint8_t)textResult.r, (uint8_t)textResult.g, (uint8_t)textResult.b, (uint8_t)textResult.a));
GetButtonTextObject()->SetNewTextColor(GetAdaptiveTextColor());
GetButtonTextObject()->ApplyNewTextSettingsToExistingText();
}

Expand Down

0 comments on commit 2080d57

Please sign in to comment.