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

Merge pull request #8489 from Robyt3/UI-DoubleClick-Handling

Browse source 
Move double-click handling from engine input to UI, improve envelope editor double-click handling
This commit is contained in:
Dennis Felsing 2024-06-15 01:03:40 +00:00 committed by GitHub
parent f061dfdc84 4852dc435d
commit 3d4a9af659
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 45 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/engine/client/input.cpp
View file

@ -66,7 +66,6 @@ CInput::CInput()
m_InputCounter = 1;
m_InputGrabbed = false;
m_MouseDoubleClick = false;
m_MouseFocus = true;
m_pClipboardText = nullptr;
@ -307,16 +306,6 @@ bool CInput::NativeMousePressed(int Index)
return (i & SDL_BUTTON(Index)) != 0;
}
bool CInput::MouseDoubleClick()
{
if(m_MouseDoubleClick)
{
m_MouseDoubleClick = false;
return true;
}
return false;
}
const char *CInput::GetClipboardText()
{
SDL_free(m_pClipboardText);
@ -364,7 +353,6 @@ void CInput::Clear()
mem_zero(m_aInputState, sizeof(m_aInputState));
mem_zero(m_aInputCount, sizeof(m_aInputCount));
m_vInputEvents.clear();
m_MouseDoubleClick = false;
}
float CInput::GetUpdateTime() const
@ -743,13 +731,6 @@ int CInput::Update()
Scancode = KEY_MOUSE_8;
if(Event.button.button == 9)
Scancode = KEY_MOUSE_9;
if(Event.button.button == SDL_BUTTON_LEFT)
{
if(Event.button.clicks % 2 == 0)
m_MouseDoubleClick = true;
if(Event.button.clicks == 1)
m_MouseDoubleClick = false;
}
break;
case SDL_MOUSEWHEEL:

2
src/engine/client/input.h
View file

@ -77,7 +77,6 @@ private:
char *m_pClipboardText;
bool m_MouseFocus;
bool m_MouseDoubleClick;
#if defined(CONF_PLATFORM_ANDROID)
ivec2 m_LastMousePos = ivec2(0, 0); // No relative mouse on Android
int m_NumBackPresses = 0;
@ -145,7 +144,6 @@ public:
void MouseModeRelative() override;
void NativeMousePos(int *pX, int *pY) const override;
bool NativeMousePressed(int Index) override;
bool MouseDoubleClick() override;
const char *GetClipboardText() override;
void SetClipboardText(const char *pText) override;

1
src/engine/input.h
View file

@ -93,7 +93,6 @@ public:
virtual bool NativeMousePressed(int Index) = 0;
virtual void MouseModeRelative() = 0;
virtual void MouseModeAbsolute() = 0;
virtual bool MouseDoubleClick() = 0;
virtual bool MouseRelative(float *pX, float *pY) = 0;
// clipboard

2
src/game/client/components/menus_browser.cpp
View file

@ -1551,7 +1551,7 @@ void CMenus::RenderServerbrowserFriends(CUIRect View)
{
str_copy(g_Config.m_UiServerAddress, Friend.ServerInfo()->m_aAddress);
m_ServerBrowserShouldRevealSelection = true;
if(Input()->MouseDoubleClick())
if(Ui()->DoDoubleClickLogic(Friend.ListItemId()))
{
Connect(g_Config.m_UiServerAddress);
}

17
src/game/client/ui.cpp
View file

@ -475,6 +475,21 @@ int CUi::DoDraggableButtonLogic(const void *pId, int Checked, const CUIRect *pRe
return ReturnValue;
}
bool CUi::DoDoubleClickLogic(const void *pId)
{
if(m_DoubleClickState.m_pLastClickedId == pId &&
Client()->GlobalTime() - m_DoubleClickState.m_LastClickTime < 0.5f &&
distance(m_DoubleClickState.m_LastClickPos, MousePos()) <= 32.0f * Screen()->h / Graphics()->ScreenHeight())
{
m_DoubleClickState.m_pLastClickedId = nullptr;
return true;
}
m_DoubleClickState.m_pLastClickedId = pId;
m_DoubleClickState.m_LastClickTime = Client()->GlobalTime();
m_DoubleClickState.m_LastClickPos = MousePos();
return false;
}
EEditState CUi::DoPickerLogic(const void *pId, const CUIRect *pRect, float *pX, float *pY)
{
if(MouseHovered(pRect))
@ -1001,7 +1016,7 @@ SEditResult<int64_t> CUi::DoValueSelectorWithState(const void *pId, const CUIRec
{
SetActiveItem(nullptr);
}
if(Inside && ((m_ActiveValueSelectorState.m_Button == 0 && !m_ActiveValueSelectorState.m_DidScroll && Input()->MouseDoubleClick()) || m_ActiveValueSelectorState.m_Button == 1))
if(Inside && ((m_ActiveValueSelectorState.m_Button == 0 && !m_ActiveValueSelectorState.m_DidScroll && DoDoubleClickLogic(pId)) || m_ActiveValueSelectorState.m_Button == 1))
{
m_ActiveValueSelectorState.m_pLastTextId = pId;
m_ActiveValueSelectorState.m_NumberInput.SetInteger64(Current, Base, Props.m_HexPrefix);

9
src/game/client/ui.h
View file

@ -333,6 +333,14 @@ private:
int m_ActiveButtonLogicButton = -1;
int m_ActiveDraggableButtonLogicButton = -1;
class CDoubleClickState
{
public:
const void *m_pLastClickedId = nullptr;
float m_LastClickTime = -1.0f;
vec2 m_LastClickPos = vec2(-1.0f, -1.0f);
};
CDoubleClickState m_DoubleClickState;
const void *m_pLastEditingItem = nullptr;
float m_ActiveScrollbarOffset = 0.0f;
float m_ProgressSpinnerOffset = 0.0f;
@ -526,6 +534,7 @@ public:
int DoButtonLogic(const void *pId, int Checked, const CUIRect *pRect);
int DoDraggableButtonLogic(const void *pId, int Checked, const CUIRect *pRect, bool *pClicked, bool *pAbrupted);
bool DoDoubleClickLogic(const void *pId);
EEditState DoPickerLogic(const void *pId, const CUIRect *pRect, float *pX, float *pY);
void DoSmoothScrollLogic(float *pScrollOffset, float *pScrollOffsetChange, float ViewPortSize, float TotalSize, bool SmoothClamp = false, float ScrollSpeed = 10.0f) const;
static vec2 CalcAlignedCursorPos(const CUIRect *pRect, vec2 TextSize, int Align, const float *pBiggestCharHeight = nullptr);

9
src/game/client/ui_listbox.cpp
View file

@ -93,7 +93,6 @@ void CListBox::DoStart(float RowHeight, int NumItems, int ItemsPerRow, int RowsP
m_ListBoxRowHeight = RowHeight;
m_ListBoxNumItems = NumItems;
m_ListBoxItemsPerRow = ItemsPerRow;
m_ListBoxDoneEvents = false;
m_ListBoxItemActivated = false;
m_ListBoxItemSelected = false;
@ -174,13 +173,11 @@ CListboxItem CListBox::DoNextItem(const void *pId, bool Selected, float CornerRa
ItemClicked = false;
// process input, regard selected index
if(m_ListBoxSelectedIndex == ThisItemIndex)
if(m_ListBoxNewSelected == ThisItemIndex)
{
if(m_Active && !m_ListBoxDoneEvents)
if(m_Active)
{
m_ListBoxDoneEvents = true;
if(Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER) || (ItemClicked && Input()->MouseDoubleClick()))
if(Ui()->ConsumeHotkey(CUi::HOTKEY_ENTER) || (ItemClicked && Ui()->DoDoubleClickLogic(pId)))
{
m_ListBoxItemActivated = true;
Ui()->SetActiveItem(nullptr);

1
src/game/client/ui_listbox.h
View file

@ -24,7 +24,6 @@ private:
int m_ListBoxNewSelected;
int m_ListBoxNewSelOffset;
bool m_ListBoxUpdateScroll;
bool m_ListBoxDoneEvents;
int m_ListBoxNumItems;
int m_ListBoxItemsPerRow;
bool m_ListBoxItemSelected;

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

@ -312,7 +312,7 @@ SEditResult<int> CEditor::UiDoValueSelector(void *pId, CUIRect *pRect, const cha
{
Ui()->SetActiveItem(nullptr);
}
if(Inside && ((s_ButtonUsed == 0 && !s_DidScroll && Input()->MouseDoubleClick()) || s_ButtonUsed == 1))
if(Inside && ((s_ButtonUsed == 0 && !s_DidScroll && Ui()->DoDoubleClickLogic(pId)) || s_ButtonUsed == 1))
{
s_pLastTextId = pId;
s_NumberInput.SetInteger(Current, Base);
@ -3907,7 +3907,7 @@ void CEditor::RenderLayers(CUIRect LayersBox)
Ui()->DoPopupMenu(&s_PopupGroupId, Ui()->MouseX(), Ui()->MouseY(), 145, 256, this, PopupGroup);
}
if(!m_Map.m_vpGroups[g]->m_vpLayers.empty() && Input()->MouseDoubleClick())
if(!m_Map.m_vpGroups[g]->m_vpLayers.empty() && Ui()->DoDoubleClickLogic(m_Map.m_vpGroups[g].get()))
m_Map.m_vpGroups[g]->m_Collapse ^= 1;
SetOperation(OP_NONE);
@ -6334,8 +6334,6 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
ResetZoomEnvelope(pEnvelope, s_ActiveChannels);
}
static int s_EnvelopeEditorId = 0;
ColorRGBA aColors[] = {ColorRGBA(1, 0.2f, 0.2f), ColorRGBA(0.2f, 1, 0.2f), ColorRGBA(0.2f, 0.2f, 1), ColorRGBA(1, 1, 0.2f)};
CUIRect Button;
@ -6389,6 +6387,8 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
m_Map.OnModify();
}
static int s_EnvelopeEditorId = 0;
static int s_EnvelopeEditorButtonUsed = -1;
const bool ShouldPan = s_Operation == EEnvelopeEditorOp::OP_NONE && (Ui()->MouseButton(2) || (Ui()->MouseButton(0) && Input()->ModifierIsPressed()));
if(m_pContainerPanned == &s_EnvelopeEditorId)
{
@ -6439,7 +6439,17 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
// do stuff
if(Ui()->MouseButton(0))
{
if(Input()->MouseDoubleClick())
s_EnvelopeEditorButtonUsed = 0;
if(s_Operation != EEnvelopeEditorOp::OP_BOX_SELECT && !Input()->ModifierIsPressed())
{
s_Operation = EEnvelopeEditorOp::OP_BOX_SELECT;
s_MouseXStart = Ui()->MouseX();
s_MouseYStart = Ui()->MouseY();
}
}
else if(s_EnvelopeEditorButtonUsed == 0)
{
if(Ui()->DoDoubleClickLogic(&s_EnvelopeEditorId))
{
// add point
float Time = ScreenToEnvelopeX(View, Ui()->MouseX());
@ -6462,14 +6472,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
RemoveTimeOffsetEnvelope(pEnvelope);
m_Map.OnModify();
}
else if(s_Operation != EEnvelopeEditorOp::OP_BOX_SELECT && !Input()->ModifierIsPressed())
{
static int s_BoxSelectId = 0;
Ui()->SetActiveItem(&s_BoxSelectId);
s_Operation = EEnvelopeEditorOp::OP_BOX_SELECT;
s_MouseXStart = Ui()->MouseX();
s_MouseYStart = Ui()->MouseY();
}
s_EnvelopeEditorButtonUsed = -1;
}
m_ShowEnvelopePreview = SHOWENV_SELECTED;