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

Merge pull request #1982 from Dune-jr/editor-add-exit

Browse source 
Mercifully add an exit button to the editor
This commit is contained in:
oy 2019-01-17 16:42:08 +01:00 committed by GitHub
parent 17628eeca9 c456d308a6
commit 8a5e6ebe87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@
#include <game/client/localization.h>
#include <game/client/render.h>
#include <game/client/ui.h>
#include <game/client/components/menus.h>
#include <generated/client_data.h>
#include "auto_map.h"
@ -4136,6 +4137,7 @@ int CEditor::PopupMenuFile(CEditor *pEditor, CUIRect View)
void CEditor::RenderMenubar(CUIRect MenuBar)
{
CUIRect ExitButton;
static CUIRect s_File /*, view, help*/;
MenuBar.VSplitLeft(60.0f, &s_File, &MenuBar);
@ -4143,14 +4145,26 @@ void CEditor::RenderMenubar(CUIRect MenuBar)
UiInvokePopupMenu(&s_File, 1, s_File.x, s_File.y+s_File.h-1.0f, 120, 150, PopupMenuFile, this);
CUIRect Info;
MenuBar.VSplitRight(20.f, &MenuBar, &ExitButton);
MenuBar.VSplitLeft(40.0f, 0, &MenuBar);
MenuBar.VSplitLeft(MenuBar.w*0.75f, &MenuBar, &Info);
char aBuf[128];
str_format(aBuf, sizeof(aBuf), "File: %s", m_aFileName);
UI()->DoLabel(&MenuBar, aBuf, 10.0f, CUI::ALIGN_LEFT);
str_format(aBuf, sizeof(aBuf), "Z: %i, A: %.1f, G: %i", m_ZoomLevel, m_AnimateSpeed, m_GridFactor);
UI()->DoLabel(&Info, aBuf, 10.0f, CUI::ALIGN_RIGHT);
// Exit editor button
static int s_ExitButton;
ExitButton.VSplitRight(13.f, 0, &ExitButton);
if(DoButton_Editor(&s_ExitButton, "\xE2\x9C\x95", 1, &ExitButton, 0, "[ctrl+shift+e] Exit"))
{
g_Config.m_ClEditor ^= 1;
Input()->MouseModeRelative();
}
}
void CEditor::Render()