compositor: refactor class member vars (#10141)

This commit is contained in:
davc0n 2025-04-22 15:23:29 +02:00 committed by GitHub
parent 3577a6be31
commit 241a4935a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
68 changed files with 751 additions and 756 deletions

View file

@ -55,17 +55,17 @@ void CInputMethodRelay::onNewIME(SP<CInputMethodV2> pIME) {
Debug::log(LOG, "New input popup");
});
if (!g_pCompositor->m_pLastFocus)
if (!g_pCompositor->m_lastFocus)
return;
for (auto const& ti : m_vTextInputs) {
if (ti->client() != g_pCompositor->m_pLastFocus->client())
if (ti->client() != g_pCompositor->m_lastFocus->client())
continue;
if (ti->isV3())
ti->enter(g_pCompositor->m_pLastFocus.lock());
ti->enter(g_pCompositor->m_lastFocus.lock());
else
ti->onEnabled(g_pCompositor->m_pLastFocus.lock());
ti->onEnabled(g_pCompositor->m_lastFocus.lock());
}
}
@ -74,11 +74,11 @@ void CInputMethodRelay::removePopup(CInputPopup* pPopup) {
}
CTextInput* CInputMethodRelay::getFocusedTextInput() {
if (!g_pCompositor->m_pLastFocus)
if (!g_pCompositor->m_lastFocus)
return nullptr;
for (auto const& ti : m_vTextInputs) {
if (ti->focusedSurface() == g_pCompositor->m_pLastFocus)
if (ti->focusedSurface() == g_pCompositor->m_lastFocus)
return ti.get();
}