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

Keys still work in editor with TAB pressed

Browse source
This commit is contained in:
def 2014-08-21 00:21:18 +02:00
parent dbd3f94dbe
commit 6e7594c22a
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3996,10 +3996,10 @@ void CEditor::Render()
} }
m_ZoomLevel = clamp(m_ZoomLevel, 50, 2000); m_ZoomLevel = clamp(m_ZoomLevel, 50, 2000);
m_WorldZoom = m_ZoomLevel/100.0f; m_WorldZoom = m_ZoomLevel/100.0f;
float Brightness = 0.25f;
if(m_GuiActive) if(m_GuiActive)
{ {
float Brightness = 0.25f;
RenderBackground(MenuBar, ms_BackgroundTexture, 128.0f, Brightness*0); RenderBackground(MenuBar, ms_BackgroundTexture, 128.0f, Brightness*0);
MenuBar.Margin(2.0f, &MenuBar); MenuBar.Margin(2.0f, &MenuBar);
@ -4012,11 +4012,18 @@ void CEditor::Render()
RenderBackground(StatusBar, ms_BackgroundTexture, 128.0f, Brightness); RenderBackground(StatusBar, ms_BackgroundTexture, 128.0f, Brightness);
StatusBar.Margin(2.0f, &StatusBar); StatusBar.Margin(2.0f, &StatusBar);
}
else
{
ToolBar.y = -300;
}
// do the toolbar // do the toolbar
if(m_Mode == MODE_LAYERS) if(m_Mode == MODE_LAYERS)
DoToolbar(ToolBar); DoToolbar(ToolBar);
if(m_GuiActive)
{
if(m_ShowEnvelopeEditor) if(m_ShowEnvelopeEditor)
{ {
RenderBackground(EnvelopeEditor, ms_BackgroundTexture, 128.0f, Brightness); RenderBackground(EnvelopeEditor, ms_BackgroundTexture, 128.0f, Brightness);