Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
f93d297c
Commit
f93d297c
authored
Sep 04, 2013
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some comments.
parent
bf3690d8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
opengl_compositor.cpp
common/gal/opengl/opengl_compositor.cpp
+2
-1
tool_manager.cpp
common/tool/tool_manager.cpp
+3
-2
tool_manager.h
include/tool/tool_manager.h
+1
-1
No files found.
common/gal/opengl/opengl_compositor.cpp
View file @
f93d297c
...
...
@@ -167,8 +167,9 @@ unsigned int OPENGL_COMPOSITOR::CreateBuffer()
}
}
ClearBuffer
();
// Return to direct rendering (we were asked only to create a buffer, not switch to one)
glBindFramebuffer
(
GL_FRAMEBUFFER
,
DIRECT_RENDERING
);
m_currentFbo
=
DIRECT_RENDERING
;
...
...
common/tool/tool_manager.cpp
View file @
f93d297c
...
...
@@ -207,9 +207,9 @@ void TOOL_MANAGER::dispatchInternal( TOOL_EVENT& aEvent )
st
->
wakeupEvent
=
aEvent
;
st
->
pendingWait
=
false
;
st
->
waitEvents
.
clear
();
st
->
cofunc
->
Resume
();
if
(
!
st
->
cofunc
->
Running
()
)
if
(
!
st
->
cofunc
->
Resume
()
)
{
// The couroutine has finished
finishTool
(
st
);
}
...
...
@@ -258,6 +258,7 @@ void TOOL_MANAGER::finishTool( TOOL_STATE* aState )
{
wxASSERT
(
m_activeTools
.
front
()
==
aState
->
theTool
->
GetId
()
);
// Deactivate the most recent tool and remove it from the active tools queue
aState
->
idle
=
true
;
m_activeTools
.
erase
(
m_activeTools
.
begin
()
);
...
...
include/tool/tool_manager.h
View file @
f93d297c
...
...
@@ -154,7 +154,7 @@ public:
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
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment