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

Focus command field when something changed

Browse source
This commit is contained in:
def 2020-10-06 12:58:37 +02:00
parent 032ae67814
commit ea8bee4d34
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5556,7 +5556,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View)
}
}
void CEditor::RenderServerSettingsEditor(CUIRect View)
void CEditor::RenderServerSettingsEditor(CUIRect View, bool ShowServerSettingsEditorLast)
{
static int s_CommandSelectedIndex = -1;
@ -5577,6 +5577,9 @@ void CEditor::RenderServerSettingsEditor(CUIRect View)
static int s_ClearButton = 0;
DoClearableEditBox(&m_CommandBox, &s_ClearButton, &Button, m_aSettingsCommand, sizeof(m_aSettingsCommand), 12.0f, &m_CommandBox, false, CUI::CORNER_ALL);
if(!ShowServerSettingsEditorLast) // Just activated
UI()->SetActiveItem(&m_CommandBox);
// buttons
ToolBar.VSplitRight(50.0f, &ToolBar, &Button);
static int s_AddButton = 0;
@ -5600,6 +5603,7 @@ void CEditor::RenderServerSettingsEditor(CUIRect View)
s_CommandSelectedIndex = m_Map.m_lSettings.size() - 1;
}
}
UI()->SetActiveItem(&m_CommandBox);
}
if(m_Map.m_lSettings.size() && s_CommandSelectedIndex > -1 && s_CommandSelectedIndex < m_Map.m_lSettings.size())
@ -5629,6 +5633,7 @@ void CEditor::RenderServerSettingsEditor(CUIRect View)
str_copy(m_Map.m_lSettings[s_CommandSelectedIndex].m_aCommand, m_aSettingsCommand, sizeof(m_Map.m_lSettings[s_CommandSelectedIndex].m_aCommand));
}
}
UI()->SetActiveItem(&m_CommandBox);
}
ToolBar.VSplitRight(50.0f, &ToolBar, &Button);
@ -5638,11 +5643,10 @@ void CEditor::RenderServerSettingsEditor(CUIRect View)
{
m_Map.m_lSettings.remove_index(s_CommandSelectedIndex);
if(s_CommandSelectedIndex >= m_Map.m_lSettings.size())
{
s_CommandSelectedIndex = m_Map.m_lSettings.size() - 1;
if(s_CommandSelectedIndex >= 0)
str_copy(m_aSettingsCommand, m_Map.m_lSettings[s_CommandSelectedIndex].m_aCommand, sizeof(m_aSettingsCommand));
}
if(s_CommandSelectedIndex >= 0)
str_copy(m_aSettingsCommand, m_Map.m_lSettings[s_CommandSelectedIndex].m_aCommand, sizeof(m_aSettingsCommand));
UI()->SetActiveItem(&m_CommandBox);
}
}
}
@ -5706,6 +5710,7 @@ void CEditor::RenderServerSettingsEditor(CUIRect View)
{
s_CommandSelectedIndex = i;
str_copy(m_aSettingsCommand, m_Map.m_lSettings[i].m_aCommand, sizeof(m_aSettingsCommand));
UI()->SetActiveItem(&m_CommandBox);
}
}
ListCur += 17.0f;
@ -6147,8 +6152,12 @@ void CEditor::Render()
RenderEnvelopeEditor(ExtraEditor);
if(m_ShowUndo)
RenderUndoList(UndoList);
static bool s_ShowServerSettingsEditorLast = false;
if(m_ShowServerSettingsEditor)
RenderServerSettingsEditor(ExtraEditor);
{
RenderServerSettingsEditor(ExtraEditor, s_ShowServerSettingsEditorLast);
}
s_ShowServerSettingsEditorLast = m_ShowServerSettingsEditor;
}
}

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

@ -1049,7 +1049,7 @@ public:
void RenderStatusbar(CUIRect View);
void RenderEnvelopeEditor(CUIRect View);
void RenderUndoList(CUIRect View);
void RenderServerSettingsEditor(CUIRect View);
void RenderServerSettingsEditor(CUIRect View, bool ShowServerSettingsEditorLast);
void RenderMenubar(CUIRect Menubar);
void RenderFileDialog();