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

Fixed the problem of GAL frames excessively taking over focus in Windows.

This commit is contained in:
Maciej Suminski 2015-08-25 11:21:00 +02:00
parent 0723ac5bef
commit 8fa28797f9
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/draw_panel_gal.cpp
View File

@ -117,6 +117,22 @@ EDA_DRAW_PANEL_GAL::~EDA_DRAW_PANEL_GAL()
} }
void EDA_DRAW_PANEL_GAL::SetFocus()
{
// Windows has a strange manner on bringing up and activating windows
// containing a GAL canvas just after moving the mouse cursor into its area.
// Feel free to uncomment or extend the following #ifdef if you experience
// similar problems on your platform.
#ifdef __WINDOWS__
if( !GetParent()->IsDescendant( wxWindow::FindFocus() ) )
return;
#endif
wxScrolledCanvas::SetFocus();
m_lostFocus = false;
}
void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) ) void EDA_DRAW_PANEL_GAL::onPaint( wxPaintEvent& WXUNUSED( aEvent ) )
{ {
m_pendingRefresh = false; m_pendingRefresh = false;
@ -330,10 +346,7 @@ bool EDA_DRAW_PANEL_GAL::SwitchBackend( GAL_TYPE aGalType )
void EDA_DRAW_PANEL_GAL::onEvent( wxEvent& aEvent ) void EDA_DRAW_PANEL_GAL::onEvent( wxEvent& aEvent )
{ {
if( m_lostFocus ) if( m_lostFocus )
{
SetFocus(); SetFocus();
m_lostFocus = false;
}
if( !m_eventDispatcher ) if( !m_eventDispatcher )
aEvent.Skip(); aEvent.Skip();
@ -348,12 +361,16 @@ void EDA_DRAW_PANEL_GAL::onEnter( wxEvent& aEvent )
{ {
// Getting focus is necessary in order to receive key events properly // Getting focus is necessary in order to receive key events properly
SetFocus(); SetFocus();
aEvent.Skip();
} }
void EDA_DRAW_PANEL_GAL::onLostFocus( wxFocusEvent& aEvent ) void EDA_DRAW_PANEL_GAL::onLostFocus( wxFocusEvent& aEvent )
{ {
m_lostFocus = true; m_lostFocus = true;
aEvent.Skip();
} }

2
include/class_draw_panel_gal.h
View File

@ -63,6 +63,8 @@ public:
const wxSize& aSize, GAL_TYPE aGalType = GAL_TYPE_OPENGL ); const wxSize& aSize, GAL_TYPE aGalType = GAL_TYPE_OPENGL );
~EDA_DRAW_PANEL_GAL(); ~EDA_DRAW_PANEL_GAL();
virtual void SetFocus();
/** /**
* Function SwitchBackend * Function SwitchBackend
* Switches method of rendering graphics. * Switches method of rendering graphics.