From 21184404885cf61f7c10d2eb749478ef6b035dd2 Mon Sep 17 00:00:00 2001 From: davc0n Date: Mon, 28 Apr 2025 22:25:22 +0200 Subject: windows: refactor class member vars (#10168) --- src/render/decorations/DecorationPositioner.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/render/decorations/DecorationPositioner.cpp') diff --git a/src/render/decorations/DecorationPositioner.cpp b/src/render/decorations/DecorationPositioner.cpp index b2d32ad0..cb70304f 100644 --- a/src/render/decorations/DecorationPositioner.cpp +++ b/src/render/decorations/DecorationPositioner.cpp @@ -91,8 +91,8 @@ void CDecorationPositioner::sanitizeDatas() { std::erase_if(m_vWindowPositioningDatas, [](const auto& other) { if (!validMapped(other->pWindow)) return true; - if (std::find_if(other->pWindow->m_dWindowDecorations.begin(), other->pWindow->m_dWindowDecorations.end(), - [&](const auto& el) { return el.get() == other->pDecoration; }) == other->pWindow->m_dWindowDecorations.end()) + if (std::find_if(other->pWindow->m_windowDecorations.begin(), other->pWindow->m_windowDecorations.end(), [&](const auto& el) { return el.get() == other->pDecoration; }) == + other->pWindow->m_windowDecorations.end()) return true; return false; }); @@ -123,13 +123,13 @@ void CDecorationPositioner::onWindowUpdate(PHLWINDOW pWindow) { // std::vector datas; // reserve to avoid reallocations - datas.reserve(pWindow->m_dWindowDecorations.size()); + datas.reserve(pWindow->m_windowDecorations.size()); - for (auto const& wd : pWindow->m_dWindowDecorations) { + for (auto const& wd : pWindow->m_windowDecorations) { datas.push_back(getDataFor(wd.get(), pWindow)); } - if (WINDOWDATA->lastWindowSize == pWindow->m_vRealSize->value() /* position not changed */ + if (WINDOWDATA->lastWindowSize == pWindow->m_realSize->value() /* position not changed */ && std::all_of(m_vWindowPositioningDatas.begin(), m_vWindowPositioningDatas.end(), [pWindow](const auto& data) { return pWindow != data->pWindow.lock() || !data->needsReposition; }) /* all window datas are either not for this window or don't need a reposition */ @@ -141,9 +141,9 @@ void CDecorationPositioner::onWindowUpdate(PHLWINDOW pWindow) { wd->positioningInfo = wd->pDecoration->getPositioningInfo(); } - WINDOWDATA->lastWindowSize = pWindow->m_vRealSize->value(); + WINDOWDATA->lastWindowSize = pWindow->m_realSize->value(); WINDOWDATA->needsRecalc = false; - const bool EPHEMERAL = pWindow->m_vRealSize->isBeingAnimated(); + const bool EPHEMERAL = pWindow->m_realSize->isBeingAnimated(); std::sort(datas.begin(), datas.end(), [](const auto& a, const auto& b) { return a->positioningInfo.priority > b->positioningInfo.priority; }); -- cgit v1.2.3