Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add even more focus tracing to wxOSX

Browse Source 
Log CanFocus() results too.
This commit is contained in:
Vadim Zeitlin
2019-10-27 00:19:56 +02:00
parent 3406147690
commit 55da22563b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osx/cocoa/window.mm
View File

@@ -3093,7 +3093,10 @@ bool wxWidgetCocoaImpl::CanFocus() const
NSView* targetView = m_osxView; NSView* targetView = m_osxView;
if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
targetView = [(NSScrollView*) m_osxView documentView]; targetView = [(NSScrollView*) m_osxView documentView];
return [targetView canBecomeKeyView] == YES; const bool canFocus = [targetView canBecomeKeyView] == YES;
wxLogTrace(TRACE_FOCUS, "CanFocus(%s) -> %s",
wxDumpNSView(m_osxView), canFocus ? "YES" : "NO");
return canFocus;
} }
bool wxWidgetCocoaImpl::HasFocus() const bool wxWidgetCocoaImpl::HasFocus() const
@@ -3107,12 +3110,17 @@ bool wxWidgetCocoaImpl::HasFocus() const
bool wxWidgetCocoaImpl::SetFocus() bool wxWidgetCocoaImpl::SetFocus()
{ {
if ( !CanFocus() ) if ( !CanFocus() )
{
wxLogTrace(TRACE_FOCUS, "Not setting focus to %s", wxDumpNSView(m_osxView));
return false; return false;
}
NSView* targetView = m_osxView; NSView* targetView = m_osxView;
if ( [m_osxView isKindOfClass:[NSScrollView class] ] ) if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
targetView = [(NSScrollView*) m_osxView documentView]; targetView = [(NSScrollView*) m_osxView documentView];
wxLogTrace(TRACE_FOCUS, "Setting focus to %s", wxDumpNSView(m_osxView));
[[m_osxView window] makeFirstResponder: targetView] ; [[m_osxView window] makeFirstResponder: targetView] ;
return true; return true;
} }