haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some comments.

This commit is contained in:
Maciej Suminski 2013-09-04 16:25:57 +02:00
parent bf3690d841
commit f93d297cb5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/gal/opengl/opengl_compositor.cpp
View File

@ -167,8 +167,9 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
} }
} }
ClearBuffer(); ClearBuffer();
// Return to direct rendering (we were asked only to create a buffer, not switch to one)
glBindFramebuffer( GL_FRAMEBUFFER, DIRECT_RENDERING ); glBindFramebuffer( GL_FRAMEBUFFER, DIRECT_RENDERING );
m_currentFbo = DIRECT_RENDERING; m_currentFbo = DIRECT_RENDERING;

5
common/tool/tool_manager.cpp
View File

@ -207,9 +207,9 @@ void TOOL_MANAGER::dispatchInternal( TOOL_EVENT& aEvent )
st->wakeupEvent = aEvent; st->wakeupEvent = aEvent;
st->pendingWait = false; st->pendingWait = false;
st->waitEvents.clear(); st->waitEvents.clear();
st->cofunc->Resume(); if( !st->cofunc->Resume() )
if( !st->cofunc->Running() )
{ {
// The couroutine has finished
finishTool( st ); finishTool( st );
} }
@ -258,6 +258,7 @@ void TOOL_MANAGER::finishTool( TOOL_STATE* aState )
{ {
wxASSERT( m_activeTools.front() == aState->theTool->GetId() ); wxASSERT( m_activeTools.front() == aState->theTool->GetId() );
// Deactivate the most recent tool and remove it from the active tools queue
aState->idle = true; aState->idle = true;
m_activeTools.erase( m_activeTools.begin() ); m_activeTools.erase( m_activeTools.begin() );

2
include/tool/tool_manager.h
View File

@ -154,7 +154,7 @@ public:
CONTEXT_MENU_TRIGGER aTrigger ); CONTEXT_MENU_TRIGGER aTrigger );
/** /**
* Allows a tool pass the already handled event to be passed to the next tool on the stack. * Allows a tool to pass the already handled event to the next tool on the stack.
*/ */
void PassEvent() void PassEvent()
{ {