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

added option to type text into valueselector

Browse source
This commit is contained in:
H-M-H 2015-03-30 03:20:35 +02:00
parent 87471f752b
commit 68db1c1113
1 changed files with 89 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */ /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
/* If you are missing that file, acquire a complete release at teeworlds.com. */ /* If you are missing that file, acquire a complete release at teeworlds.com. */
#include <iostream>
#include <base/tl/array.h> #include <base/tl/array.h>
@ -663,59 +664,97 @@ void CEditor::RenderBackground(CUIRect View, int Texture, float Size, float Brig
int CEditor::UiDoValueSelector(void *pID, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip) int CEditor::UiDoValueSelector(void *pID, CUIRect *pRect, const char *pLabel, int Current, int Min, int Max, int Step, float Scale, const char *pToolTip)
{ {
// logic // logic
static float s_Value; static float s_Value;
int Inside = UI()->MouseInside(pRect); static char s_NumStr[64];
static bool s_TextMode = false;
static void* s_LastTextpID = pID;
int Inside = UI()->MouseInside(pRect);
if(UI()->ActiveItem() == pID) if(UI()->MouseButton(1) && UI()->HotItem() == pID)
{ {
if(!UI()->MouseButton(0)) s_LastTextpID = pID;
{ s_TextMode = true;
m_LockMouse = false; str_format(s_NumStr, sizeof(s_NumStr), "%d", Current);
UI()->SetActiveItem(0); }
}
else
{
if(Input()->KeyPressed(KEY_LSHIFT) || Input()->KeyPressed(KEY_RSHIFT))
s_Value += m_MouseDeltaX*0.05f;
else
s_Value += m_MouseDeltaX;
if(absolute(s_Value) > Scale) if(s_TextMode && s_LastTextpID == pID)
{ {
int Count = (int)(s_Value/Scale); m_pTooltip = "Type your number";
s_Value = fmod(s_Value, Scale);
Current += Step*Count;
if(Current < Min)
Current = Min;
if(Current > Max)
Current = Max;
}
}
if(pToolTip)
m_pTooltip = pToolTip;
}
else if(UI()->HotItem() == pID)
{
if(UI()->MouseButton(0))
{
m_LockMouse = true;
s_Value = 0;
UI()->SetActiveItem(pID);
}
if(pToolTip)
m_pTooltip = pToolTip;
}
if(Inside) static float s_NumberBoxID = 0;
UI()->SetHotItem(pID); DoEditBox(&s_NumberBoxID, pRect, s_NumStr, sizeof(s_NumStr), 10.0f, &s_NumberBoxID);
// render UI()->SetActiveItem(&s_NumberBoxID);
char aBuf[128];
str_format(aBuf, sizeof(aBuf),"%s %d", pLabel, Current); if(Input()->KeyPressed(KEY_RETURN) || Input()->KeyPressed(KEY_KP_ENTER))
RenderTools()->DrawUIRect(pRect, GetButtonColor(pID, 0), CUI::CORNER_ALL, 5.0f); {
pRect->y += pRect->h/2.0f-7.0f; Current = clamp(str_toint(s_NumStr), Min, Max);
UI()->DoLabel(pRect, aBuf, 10, 0, -1); UI()->SetActiveItem(0);
s_TextMode = false;
}
if(Input()->KeyPressed(KEY_ESCAPE))
{
UI()->SetActiveItem(0);
s_TextMode = false;
}
}
else
{
if(UI()->ActiveItem() == pID)
{
if(!UI()->MouseButton(0))
{
m_LockMouse = false;
UI()->SetActiveItem(0);
}
else
{
if(Input()->KeyPressed(KEY_LSHIFT) || Input()->KeyPressed(KEY_RSHIFT))
s_Value += m_MouseDeltaX*0.05f;
else
s_Value += m_MouseDeltaX;
if(absolute(s_Value) > Scale)
{
int Count = (int)(s_Value/Scale);
s_Value = fmod(s_Value, Scale);
Current += Step*Count;
Current = clamp(Current, Min, Max);
}
}
if(pToolTip && !s_TextMode)
m_pTooltip = pToolTip;
}
else if(UI()->HotItem() == pID)
{
if(UI()->MouseButton(0))
{
m_LockMouse = true;
s_Value = 0;
UI()->SetActiveItem(pID);
}
if(pToolTip && !s_TextMode)
m_pTooltip = pToolTip;
if(!Inside)
{
UI()->SetActiveItem(0);
s_TextMode = false;
}
}
if(Inside)
UI()->SetHotItem(pID);
// render
char aBuf[128];
str_format(aBuf, sizeof(aBuf),"%s %d", pLabel, Current);
RenderTools()->DrawUIRect(pRect, GetButtonColor(pID, 0), CUI::CORNER_ALL, 5.0f);
pRect->y += pRect->h/2.0f-7.0f;
UI()->DoLabel(pRect, aBuf, 10, 0, -1);
}
return Current; return Current;
} }
@ -1878,7 +1917,7 @@ void CEditor::DoQuadEnvPoint(const CQuad *pQuad, int QIndex, int PIndex)
else else
IgnoreGrid = false; IgnoreGrid = false;
if(UI()->ActiveItem() == pID && s_ActQIndex == QIndex) if(UI()->ActiveItem() == pID && s_ActQIndex == QIndex)
{ {
if(s_Operation == OP_MOVE) if(s_Operation == OP_MOVE)
{ {