edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract CEditor::DoColorPickerButton function

Browse source 
Fix color not being updated while shift key is pressed, due to use of `else if`.
This commit is contained in:
Robert Müller 2023-11-11 16:42:25 +01:00
parent 8bde57a1ca
commit c48623de8f
2 changed files with 64 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
src/game/editor/editor.cpp
View file

@ -3098,58 +3098,15 @@ int CEditor::DoProperties(CUIRect *pToolBox, CProperty *pProps, int *pIDs, int *
} }
else if(pProps[i].m_Type == PROPTYPE_COLOR) else if(pProps[i].m_Type == PROPTYPE_COLOR)
{ {
const ColorRGBA ColorPick = ColorRGBA::UnpackAlphaLast<ColorRGBA>(pProps[i].m_Value); const auto &&SetColor = [&](ColorRGBA NewColor) {
const int NewValue = NewColor.PackAlphaLast();
CUIRect ColorRect; if(NewValue != pProps[i].m_Value)
Shifter.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f * UI()->ButtonColorMul(&pIDs[i])), IGraphics::CORNER_ALL, 5.0f);
Shifter.Margin(1.0f, &ColorRect);
ColorRect.Draw(ColorPick, IGraphics::CORNER_ALL, ColorRect.h / 2.0f);
static CUI::SColorPickerPopupContext s_ColorPickerPopupContext;
const int ButtonResult = DoButton_Editor_Common(&pIDs[i], nullptr, 0, &Shifter, 0, "Click to show the color picker. Shift+rightclick to copy color to clipboard. Shift+leftclick to paste color from clipboard.");
if(Input()->ShiftIsPressed())
{ {
if(ButtonResult == 1) *pNewVal = NewValue;
{
const char *pClipboard = Input()->GetClipboardText();
if(*pClipboard == '#' || *pClipboard == '$') // ignore leading # (web color format) and $ (console color format)
++pClipboard;
if(str_isallnum_hex(pClipboard))
{
std::optional<ColorRGBA> ParsedColor = color_parse<ColorRGBA>(pClipboard);
if(ParsedColor)
{
*pNewVal = ParsedColor.value().PackAlphaLast();
Change = i; Change = i;
} }
} };
} DoColorPickerButton(&pIDs[i], &Shifter, ColorRGBA::UnpackAlphaLast<ColorRGBA>(pProps[i].m_Value), SetColor);
else if(ButtonResult == 2)
{
char aClipboard[9];
str_format(aClipboard, sizeof(aClipboard), "%08X", ColorPick.PackAlphaLast());
Input()->SetClipboardText(aClipboard);
}
}
else if(ButtonResult > 0)
{
if(s_ColorPickerPopupContext.m_ColorMode == CUI::SColorPickerPopupContext::MODE_UNSET)
s_ColorPickerPopupContext.m_ColorMode = CUI::SColorPickerPopupContext::MODE_RGBA;
s_ColorPickerPopupContext.m_RgbaColor = ColorPick;
s_ColorPickerPopupContext.m_HslaColor = color_cast<ColorHSLA>(ColorPick);
s_ColorPickerPopupContext.m_HsvaColor = color_cast<ColorHSVA>(s_ColorPickerPopupContext.m_HslaColor);
s_ColorPickerPopupContext.m_Alpha = true;
UI()->ShowPopupColorPicker(UI()->MouseX(), UI()->MouseY(), &s_ColorPickerPopupContext);
}
else if(UI()->IsPopupOpen(&s_ColorPickerPopupContext))
{
const int NewColor = s_ColorPickerPopupContext.m_RgbaColor.PackAlphaLast(s_ColorPickerPopupContext.m_Alpha);
if(NewColor != pProps[i].m_Value)
{
*pNewVal = NewColor;
Change = i;
}
}
} }
else if(pProps[i].m_Type == PROPTYPE_IMAGE) else if(pProps[i].m_Type == PROPTYPE_IMAGE)
{ {
@ -3284,6 +3241,60 @@ int CEditor::DoProperties(CUIRect *pToolBox, CProperty *pProps, int *pIDs, int *
return Change; return Change;
} }
void CEditor::DoColorPickerButton(const void *pID, const CUIRect *pRect, ColorRGBA Color, const std::function<void(ColorRGBA Color)> &SetColor)
{
CUIRect ColorRect;
pRect->Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.5f * UI()->ButtonColorMul(pID)), IGraphics::CORNER_ALL, 5.0f);
pRect->Margin(1.0f, &ColorRect);
ColorRect.Draw(Color, IGraphics::CORNER_ALL, 5.0f);
const int ButtonResult = DoButton_Editor_Common(pID, nullptr, 0, pRect, 0, "Click to show the color picker. Shift+rightclick to copy color to clipboard. Shift+leftclick to paste color from clipboard.");
if(Input()->ShiftIsPressed())
{
if(ButtonResult == 1)
{
const char *pClipboard = Input()->GetClipboardText();
if(*pClipboard == '#' || *pClipboard == '$') // ignore leading # (web color format) and $ (console color format)
++pClipboard;
if(str_isallnum_hex(pClipboard))
{
std::optional<ColorRGBA> ParsedColor = color_parse<ColorRGBA>(pClipboard);
if(ParsedColor)
{
SetColor(ParsedColor.value());
}
}
}
else if(ButtonResult == 2)
{
char aClipboard[9];
str_format(aClipboard, sizeof(aClipboard), "%08X", Color.PackAlphaLast());
Input()->SetClipboardText(aClipboard);
}
}
else if(ButtonResult > 0)
{
if(m_ColorPickerPopupContext.m_ColorMode == CUI::SColorPickerPopupContext::MODE_UNSET)
m_ColorPickerPopupContext.m_ColorMode = CUI::SColorPickerPopupContext::MODE_RGBA;
m_ColorPickerPopupContext.m_RgbaColor = Color;
m_ColorPickerPopupContext.m_HslaColor = color_cast<ColorHSLA>(Color);
m_ColorPickerPopupContext.m_HsvaColor = color_cast<ColorHSVA>(m_ColorPickerPopupContext.m_HslaColor);
m_ColorPickerPopupContext.m_Alpha = true;
m_pColorPickerPopupActiveID = pID;
UI()->ShowPopupColorPicker(UI()->MouseX(), UI()->MouseY(), &m_ColorPickerPopupContext);
}
if(UI()->IsPopupOpen(&m_ColorPickerPopupContext))
{
if(m_pColorPickerPopupActiveID == pID)
SetColor(m_ColorPickerPopupContext.m_RgbaColor);
}
else
{
m_pColorPickerPopupActiveID = nullptr;
}
}
void CEditor::RenderLayers(CUIRect LayersBox) void CEditor::RenderLayers(CUIRect LayersBox)
{ {
const float RowHeight = 12.0f; const float RowHeight = 12.0f;

4
src/game/editor/editor.h
View file

@ -496,6 +496,10 @@ public:
int DoProperties(CUIRect *pToolbox, CProperty *pProps, int *pIDs, int *pNewVal, ColorRGBA Color = ColorRGBA(1, 1, 1, 0.5f)); int DoProperties(CUIRect *pToolbox, CProperty *pProps, int *pIDs, int *pNewVal, ColorRGBA Color = ColorRGBA(1, 1, 1, 0.5f));
CUI::SColorPickerPopupContext m_ColorPickerPopupContext;
const void *m_pColorPickerPopupActiveID = nullptr;
void DoColorPickerButton(const void *pID, const CUIRect *pRect, ColorRGBA Color, const std::function<void(ColorRGBA Color)> &SetColor);
int m_Mode; int m_Mode;
int m_Dialog; int m_Dialog;
char m_aTooltip[256] = ""; char m_aTooltip[256] = "";