diff options
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/OpenGL.hpp | 2 | ||||
| -rw-r--r-- | src/render/Renderer.hpp | 2 | ||||
| -rw-r--r-- | src/render/decorations/CHyprGroupBarDecoration.cpp | 12 | ||||
| -rw-r--r-- | src/render/decorations/CHyprGroupBarDecoration.hpp | 4 | ||||
| -rw-r--r-- | src/render/decorations/DecorationPositioner.cpp | 2 | ||||
| -rw-r--r-- | src/render/decorations/DecorationPositioner.hpp | 14 |
6 files changed, 18 insertions, 18 deletions
diff --git a/src/render/OpenGL.hpp b/src/render/OpenGL.hpp index 8098485e..3dc3b43a 100644 --- a/src/render/OpenGL.hpp +++ b/src/render/OpenGL.hpp @@ -328,4 +328,4 @@ class CHyprOpenGLImpl { friend class CSurfacePassElement; }; -inline std::unique_ptr<CHyprOpenGLImpl> g_pHyprOpenGL; +inline UP<CHyprOpenGLImpl> g_pHyprOpenGL; diff --git a/src/render/Renderer.hpp b/src/render/Renderer.hpp index 7aef96e6..1ef1eecc 100644 --- a/src/render/Renderer.hpp +++ b/src/render/Renderer.hpp @@ -155,4 +155,4 @@ class CHyprRenderer { friend class CMonitor; }; -inline std::unique_ptr<CHyprRenderer> g_pHyprRenderer; +inline UP<CHyprRenderer> g_pHyprRenderer; diff --git a/src/render/decorations/CHyprGroupBarDecoration.cpp b/src/render/decorations/CHyprGroupBarDecoration.cpp index 4a411b6c..36846fd4 100644 --- a/src/render/decorations/CHyprGroupBarDecoration.cpp +++ b/src/render/decorations/CHyprGroupBarDecoration.cpp @@ -176,11 +176,11 @@ void CHyprGroupBarDecoration::draw(PHLMONITOR pMonitor, float const& a) { CTitleTex* pTitleTex = textureFromTitle(m_dwGroupMembers[WINDOWINDEX]->m_szTitle); if (!pTitleTex) - pTitleTex = m_sTitleTexs.titleTexs - .emplace_back(std::make_unique<CTitleTex>(m_dwGroupMembers[WINDOWINDEX].lock(), - Vector2D{m_fBarWidth * pMonitor->scale, (*PTITLEFONTSIZE + 2L * BAR_TEXT_PAD) * pMonitor->scale}, - pMonitor->scale)) - .get(); + pTitleTex = + m_sTitleTexs.titleTexs + .emplace_back(makeUnique<CTitleTex>(m_dwGroupMembers[WINDOWINDEX].lock(), + Vector2D{m_fBarWidth * pMonitor->scale, (*PTITLEFONTSIZE + 2L * BAR_TEXT_PAD) * pMonitor->scale}, pMonitor->scale)) + .get(); rect.y += std::ceil((rect.height - pTitleTex->texSize.y) / 2.0); rect.height = pTitleTex->texSize.y; rect.width = pTitleTex->texSize.x; @@ -421,7 +421,7 @@ bool CHyprGroupBarDecoration::onEndWindowDragOnDeco(const Vector2D& pos, PHLWIND g_pLayoutManager->getCurrentLayout()->recalculateWindow(pDraggedWindow); if (!pDraggedWindow->getDecorationByType(DECORATION_GROUPBAR)) - pDraggedWindow->addWindowDeco(std::make_unique<CHyprGroupBarDecoration>(pDraggedWindow)); + pDraggedWindow->addWindowDeco(makeUnique<CHyprGroupBarDecoration>(pDraggedWindow)); return true; } diff --git a/src/render/decorations/CHyprGroupBarDecoration.hpp b/src/render/decorations/CHyprGroupBarDecoration.hpp index 653cd11c..7277955d 100644 --- a/src/render/decorations/CHyprGroupBarDecoration.hpp +++ b/src/render/decorations/CHyprGroupBarDecoration.hpp @@ -5,7 +5,7 @@ #include <vector> #include "../Texture.hpp" #include <string> -#include <memory> +#include "../../helpers/memory/Memory.hpp" class CTitleTex { public: @@ -70,6 +70,6 @@ class CHyprGroupBarDecoration : public IHyprWindowDecoration { struct STitleTexs { // STitleTexs* overriden = nullptr; // TODO: make shit shared in-group to decrease VRAM usage. - std::vector<std::unique_ptr<CTitleTex>> titleTexs; + std::vector<UP<CTitleTex>> titleTexs; } m_sTitleTexs; }; diff --git a/src/render/decorations/DecorationPositioner.cpp b/src/render/decorations/DecorationPositioner.cpp index 2ba3c4a7..9dbb12a6 100644 --- a/src/render/decorations/DecorationPositioner.cpp +++ b/src/render/decorations/DecorationPositioner.cpp @@ -79,7 +79,7 @@ CDecorationPositioner::SWindowPositioningData* CDecorationPositioner::getDataFor if (it != m_vWindowPositioningDatas.end()) return it->get(); - const auto DATA = m_vWindowPositioningDatas.emplace_back(std::make_unique<CDecorationPositioner::SWindowPositioningData>(pWindow, pDecoration)).get(); + const auto DATA = m_vWindowPositioningDatas.emplace_back(makeUnique<CDecorationPositioner::SWindowPositioningData>(pWindow, pDecoration)).get(); DATA->positioningInfo = pDecoration->getPositioningInfo(); diff --git a/src/render/decorations/DecorationPositioner.hpp b/src/render/decorations/DecorationPositioner.hpp index c2d69881..787c6d1f 100644 --- a/src/render/decorations/DecorationPositioner.hpp +++ b/src/render/decorations/DecorationPositioner.hpp @@ -87,13 +87,13 @@ class CDecorationPositioner { bool needsRecalc = false; }; - std::map<PHLWINDOWREF, SWindowData> m_mWindowDatas; - std::vector<std::unique_ptr<SWindowPositioningData>> m_vWindowPositioningDatas; + std::map<PHLWINDOWREF, SWindowData> m_mWindowDatas; + std::vector<UP<SWindowPositioningData>> m_vWindowPositioningDatas; - SWindowPositioningData* getDataFor(IHyprWindowDecoration* pDecoration, PHLWINDOW pWindow); - void onWindowUnmap(PHLWINDOW pWindow); - void onWindowMap(PHLWINDOW pWindow); - void sanitizeDatas(); + SWindowPositioningData* getDataFor(IHyprWindowDecoration* pDecoration, PHLWINDOW pWindow); + void onWindowUnmap(PHLWINDOW pWindow); + void onWindowMap(PHLWINDOW pWindow); + void sanitizeDatas(); }; -inline std::unique_ptr<CDecorationPositioner> g_pDecorationPositioner;
\ No newline at end of file +inline UP<CDecorationPositioner> g_pDecorationPositioner;
\ No newline at end of file |