mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 10:08:18 +00:00
Merge #6805
6805: Render editor pressed keys and saving message behind file dialog r=def- a=Robyt3 The messages were previously rendered on top of the file dialog and popup menus. ## 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:
commit
00076713cc
|
@ -6387,6 +6387,9 @@ void CEditor::Render()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RenderPressedKeys(View);
|
||||||
|
RenderSavingIndicator(View);
|
||||||
|
|
||||||
if(m_Dialog == DIALOG_FILE)
|
if(m_Dialog == DIALOG_FILE)
|
||||||
{
|
{
|
||||||
static int s_NullUiTarget = 0;
|
static int s_NullUiTarget = 0;
|
||||||
|
@ -6421,8 +6424,6 @@ void CEditor::Render()
|
||||||
if(m_GuiActive)
|
if(m_GuiActive)
|
||||||
RenderStatusbar(StatusBar);
|
RenderStatusbar(StatusBar);
|
||||||
|
|
||||||
RenderPressedKeys(View);
|
|
||||||
RenderSavingIndicator(View);
|
|
||||||
RenderMousePointer();
|
RenderMousePointer();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue