diff options
| author | oy <Tom_Adams@web.de> | 2011-04-16 19:00:28 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-04-16 19:00:28 +0200 |
| commit | bda0927a87df404299f78347babf7d901253dd4a (patch) | |
| tree | d4f31d62ec795fd26d9828db05b5e6d26d40e3fc /src/game/editor | |
| parent | 246cbed7867f4d490c5b73e8cc3e5700d1386ba0 (diff) | |
| download | zcatch-bda0927a87df404299f78347babf7d901253dd4a.tar.gz zcatch-bda0927a87df404299f78347babf7d901253dd4a.zip | |
disable envelope editor when the picker is shown
Diffstat (limited to 'src/game/editor')
| -rw-r--r-- | src/game/editor/ed_editor.cpp | 11 | ||||
| -rw-r--r-- | src/game/editor/ed_editor.h | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index 1163dc4a..2be4da76 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -1157,12 +1157,8 @@ void CEditor::DoQuadPoint(CQuad *pQuad, int QuadIndex, int V) Graphics()->QuadsDraw(&QuadItem, 1); } -void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar) +void CEditor::DoMapEditor(CUIRect View, CUIRect ToolBar, bool ShowPicker) { - //UI()->ClipEnable(&view); - - bool ShowPicker = Input()->KeyPressed(KEY_SPACE) != 0 && m_Dialog == DIALOG_NONE; - // render all good stuff if(!ShowPicker) { @@ -3050,6 +3046,7 @@ void CEditor::Render() RenderBackground(View, ms_CheckerTexture, 32.0f, 1.0f); CUIRect MenuBar, CModeBar, ToolBar, StatusBar, EnvelopeEditor, ToolBox; + bool ShowPicker = Input()->KeyPressed(KEY_SPACE) != 0 && m_Dialog == DIALOG_NONE; if(m_GuiActive) { @@ -3059,7 +3056,7 @@ void CEditor::Render() View.VSplitLeft(100.0f, &ToolBox, &View); View.HSplitBottom(16.0f, &View, &StatusBar); - if(m_ShowEnvelopeEditor) + if(m_ShowEnvelopeEditor && !ShowPicker) { float size = 125.0f; if(m_ShowEnvelopeEditor == 2) @@ -3072,7 +3069,7 @@ void CEditor::Render() // a little hack for now if(m_Mode == MODE_LAYERS) - DoMapEditor(View, ToolBar); + DoMapEditor(View, ToolBar, ShowPicker); if(m_GuiActive) { diff --git a/src/game/editor/ed_editor.h b/src/game/editor/ed_editor.h index aab757e1..41162b22 100644 --- a/src/game/editor/ed_editor.h +++ b/src/game/editor/ed_editor.h @@ -697,7 +697,7 @@ public: vec4 ButtonColorMul(const void *pID); void DoQuadPoint(CQuad *pQuad, int QuadIndex, int v); - void DoMapEditor(CUIRect View, CUIRect Toolbar); + void DoMapEditor(CUIRect View, CUIRect Toolbar, bool ShowPicker); void DoToolbar(CUIRect Toolbar); void DoQuad(CQuad *pQuad, int Index); float UiDoScrollbarV(const void *pID, const CUIRect *pRect, float Current); |