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

Merge #6391

Browse source 
6391: Revert editor changes to popup menus, so popup menus are shown also when GUI is hidden r=def- a=Robyt3

Closes #6385.

## Checklist

- [X] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test (especially base/) or added coverage to integration test
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Robert Müller <robytemueller@gmail.com>
This commit is contained in:
bors[bot] 2023-03-07 22:14:16 +00:00 committed by GitHub
parent b9486ac0af da08533adf
commit 797b153702
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1331,7 +1331,7 @@ void CEditor::DoSoundSource(CSoundSource *pSource, int Index)
{
if(!UI()->MouseButton(1))
{
if(m_vSelectedLayers.size() == 1 && m_GuiActive)
if(m_vSelectedLayers.size() == 1)
{
static int s_SourcePopupID = 0;
UiInvokePopupMenu(&s_SourcePopupID, 0, UI()->MouseX(), UI()->MouseY(), 120, 200, PopupSource);
@ -1480,7 +1480,7 @@ void CEditor::DoQuad(CQuad *pQuad, int Index)
{
if(!UI()->MouseButton(1))
{
if(m_vSelectedLayers.size() == 1 && m_GuiActive)
if(m_vSelectedLayers.size() == 1)
{
m_SelectedQuadIndex = FindSelectedQuadIndex(Index);
@ -1692,7 +1692,7 @@ void CEditor::DoQuadPoint(CQuad *pQuad, int QuadIndex, int V)
{
if(!UI()->MouseButton(1))
{
if(m_vSelectedLayers.size() == 1 && m_GuiActive)
if(m_vSelectedLayers.size() == 1)
{
m_SelectedQuadPoint = V;
m_SelectedQuadIndex = FindSelectedQuadIndex(QuadIndex);
@ -5965,8 +5965,7 @@ void CEditor::Render()
m_PopupEventWasActivated = true;
}
if(m_GuiActive)
UiDoPopupMenu();
UiDoPopupMenu();
if(m_Dialog == DIALOG_NONE && !m_MouseInsidePopup && UI()->MouseInside(&View))
{
@ -6493,14 +6492,7 @@ void CEditor::OnRender()
{
// toggle gui
if(m_Dialog == DIALOG_NONE && m_EditBoxActive == 0 && Input()->KeyPress(KEY_TAB))
{
m_GuiActive = !m_GuiActive;
if(!m_GuiActive)
{
m_LockMouse = false;
UiClosePopupMenus();
}
}
if(Input()->KeyPress(KEY_F10))
m_ShowMousePointer = false;