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

Disable search ctrl cursor management on non-OSX. 

Buggy at least on GTK and MSW.

(cherry picked from commit 764de7257f)
This commit is contained in:
Alex Shvartzkop 2024-02-16 23:13:48 +03:00
parent bf6ff5b805
commit e4218effbd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/widgets/lib_tree.cpp
View File

@ -141,11 +141,14 @@ LIB_TREE::LIB_TREE( wxWindow* aParent, const wxString& aRecentSearchesKey, LIB_T
m_query_ctrl->Bind( wxEVT_SEARCH_CANCEL, &LIB_TREE::onQueryText, this ); m_query_ctrl->Bind( wxEVT_SEARCH_CANCEL, &LIB_TREE::onQueryText, this );
m_query_ctrl->Bind( wxEVT_CHAR_HOOK, &LIB_TREE::onQueryCharHook, this ); m_query_ctrl->Bind( wxEVT_CHAR_HOOK, &LIB_TREE::onQueryCharHook, this );
m_query_ctrl->Bind( wxEVT_MOTION, &LIB_TREE::onQueryMouseMoved, this ); m_query_ctrl->Bind( wxEVT_MOTION, &LIB_TREE::onQueryMouseMoved, this );
#if defined( __WXOSX__ ) || wxCHECK_VERSION( 3, 3, 0 ) // Doesn't work properly on other ports
m_query_ctrl->Bind( wxEVT_LEAVE_WINDOW, m_query_ctrl->Bind( wxEVT_LEAVE_WINDOW,
[this] ( wxMouseEvent& aEvt ) [this]( wxMouseEvent& aEvt )
{ {
SetCursor( wxCURSOR_ARROW ); SetCursor( wxCURSOR_ARROW );
} ); } );
#endif
m_query_ctrl->Bind( wxEVT_MENU, m_query_ctrl->Bind( wxEVT_MENU,
[this]( wxCommandEvent& aEvent ) [this]( wxCommandEvent& aEvent )
@ -673,6 +676,7 @@ void LIB_TREE::onQueryCharHook( wxKeyEvent& aKeyStroke )
void LIB_TREE::onQueryMouseMoved( wxMouseEvent& aEvent ) void LIB_TREE::onQueryMouseMoved( wxMouseEvent& aEvent )
{ {
#if defined( __WXOSX__ ) || wxCHECK_VERSION( 3, 3, 0 ) // Doesn't work properly on other ports
wxPoint pos = aEvent.GetPosition(); wxPoint pos = aEvent.GetPosition();
wxRect ctrlRect = m_query_ctrl->GetScreenRect(); wxRect ctrlRect = m_query_ctrl->GetScreenRect();
int buttonWidth = ctrlRect.GetHeight(); // Presume buttons are square int buttonWidth = ctrlRect.GetHeight(); // Presume buttons are square
@ -683,6 +687,7 @@ void LIB_TREE::onQueryMouseMoved( wxMouseEvent& aEvent )
SetCursor( wxCURSOR_ARROW ); SetCursor( wxCURSOR_ARROW );
else else
SetCursor( wxCURSOR_IBEAM ); SetCursor( wxCURSOR_IBEAM );
#endif
} }