Merge pull request #1067 from cryzed/fix/server-preserve-focus

walker0643 · web-flow · commit 653e4badeb88 · 2022-02-04T11:47:29.000-05:00
Fix `Fix Preserve Focus` option not working on Linux servers
diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp
@@ -324,7 +324,7 @@ XWindowsScreen::leave()
     m_impl->XGetInputFocus(m_display, &m_lastFocus, &m_lastFocusRevert);
 
 	// take focus
-	if (m_isPrimary || !m_preserveFocus) {
+	if (!m_preserveFocus) {
         m_impl->XSetInputFocus(m_display, m_window, RevertToPointerRoot, CurrentTime);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ XWindowsScreen::leave()`
`324`	`324`	`m_impl->XGetInputFocus(m_display, &m_lastFocus, &m_lastFocusRevert);`
`325`	`325`
`326`	`326`	`// take focus`
`327`		`- if (m_isPrimary \|\| !m_preserveFocus) {`
	`327`	`+ if (!m_preserveFocus) {`
`328`	`328`	`m_impl->XSetInputFocus(m_display, m_window, RevertToPointerRoot, CurrentTime);`
`329`	`329`	`}`
`330`	`330`