diff --git a/borders-plus-plus/borderDeco.cpp b/borders-plus-plus/borderDeco.cpp index 2247052..50800e1 100644 --- a/borders-plus-plus/borderDeco.cpp +++ b/borders-plus-plus/borderDeco.cpp @@ -97,7 +97,7 @@ void CBordersPlusPlus::drawPass(PHLMONITOR pMonitor, const float& a) { return; const auto PWORKSPACE = PWINDOW->m_pWorkspace; - const auto WORKSPACEOFFSET = PWORKSPACE && !PWINDOW->m_bPinned ? PWORKSPACE->m_vRenderOffset->value() : Vector2D(); + const auto WORKSPACEOFFSET = PWORKSPACE && !PWINDOW->m_bPinned ? PWORKSPACE->m_renderOffset->value() : Vector2D(); auto rounding = PWINDOW->rounding() == 0 ? 0 : (PWINDOW->rounding() + **PBORDERSIZE) * pMonitor->scale; const auto ROUNDINGPOWER = PWINDOW->roundingPower(); diff --git a/csgo-vulkan-fix/main.cpp b/csgo-vulkan-fix/main.cpp index 244708e..5d98c96 100644 --- a/csgo-vulkan-fix/main.cpp +++ b/csgo-vulkan-fix/main.cpp @@ -60,7 +60,7 @@ void hkSetWindowSize(CXWaylandSurface* surface, const CBox& box) { newBox.w = **RESX; newBox.h = **RESY; - CWLSurface::fromResource(SURF)->m_bFillIgnoreSmall = true; + CWLSurface::fromResource(SURF)->m_fillIgnoreSmall = true; } (*(origSurfaceSize)g_pSurfaceSizeHook->m_pOriginal)(surface, newBox); diff --git a/flake.lock b/flake.lock index af41172..cb90c5e 100644 --- a/flake.lock +++ b/flake.lock @@ -145,11 +145,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1745328209, - "narHash": "sha256-eP3x+JNE1T6RjXhimaEnoc4GvNJcyzppW1vpAs287Zg=", + "lastModified": 1745593751, + "narHash": "sha256-TJ/Nijr83ydAi473NGeazYqcQ0t8lCPU7aaQv98oGg8=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "241a4935a244f403fa7108259075b04c81ed258f", + "rev": "742bce016cb848d222fbfcfcf8d3894ea3fdaeff", "type": "github" }, "original": { diff --git a/hyprbars/barDeco.cpp b/hyprbars/barDeco.cpp index 6aacd8f..efbbbe9 100644 --- a/hyprbars/barDeco.cpp +++ b/hyprbars/barDeco.cpp @@ -534,7 +534,7 @@ void CHyprBar::renderPass(PHLMONITOR pMonitor, const float& a) { } const auto PWORKSPACE = PWINDOW->m_pWorkspace; - const auto WORKSPACEOFFSET = PWORKSPACE && !PWINDOW->m_bPinned ? PWORKSPACE->m_vRenderOffset->value() : Vector2D(); + const auto WORKSPACEOFFSET = PWORKSPACE && !PWINDOW->m_bPinned ? PWORKSPACE->m_renderOffset->value() : Vector2D(); const auto ROUNDING = PWINDOW->rounding() + (*PPRECEDENCE ? 0 : PWINDOW->getRealBorderSize()); @@ -661,7 +661,7 @@ CBox CHyprBar::assignedBoxGlobal() { box.translate(g_pDecorationPositioner->getEdgeDefinedPoint(DECORATION_EDGE_TOP, m_pWindow.lock())); const auto PWORKSPACE = m_pWindow->m_pWorkspace; - const auto WORKSPACEOFFSET = PWORKSPACE && !m_pWindow->m_bPinned ? PWORKSPACE->m_vRenderOffset->value() : Vector2D(); + const auto WORKSPACEOFFSET = PWORKSPACE && !m_pWindow->m_bPinned ? PWORKSPACE->m_renderOffset->value() : Vector2D(); return box.translate(WORKSPACEOFFSET); } diff --git a/hyprexpo/overview.cpp b/hyprexpo/overview.cpp index 8d2666d..a32a045 100644 --- a/hyprexpo/overview.cpp +++ b/hyprexpo/overview.cpp @@ -111,7 +111,7 @@ COverview::COverview(PHLWORKSPACE startedOn_, bool swipe_) : startedOn(startedOn g_pHyprRenderer->m_bBlockSurfaceFeedback = true; - startedOn->m_bVisible = false; + startedOn->m_visible = false; for (size_t i = 0; i < (size_t)(SIDE_LENGTH * SIDE_LENGTH); ++i) { COverview::SWorkspaceImage& image = images[i]; @@ -131,14 +131,14 @@ COverview::COverview(PHLWORKSPACE startedOn_, bool swipe_) : startedOn(startedOn image.pWorkspace = PWORKSPACE; PMONITOR->activeWorkspace = PWORKSPACE; PWORKSPACE->startAnim(true, true, true); - PWORKSPACE->m_bVisible = true; + PWORKSPACE->m_visible = true; if (PWORKSPACE == startedOn) PMONITOR->activeSpecialWorkspace = openSpecial; g_pHyprRenderer->renderWorkspace(PMONITOR, PWORKSPACE, Time::steadyNow(), monbox); - PWORKSPACE->m_bVisible = false; + PWORKSPACE->m_visible = false; PWORKSPACE->startAnim(false, false, true); if (PWORKSPACE == startedOn) @@ -157,7 +157,7 @@ COverview::COverview(PHLWORKSPACE startedOn_, bool swipe_) : startedOn(startedOn PMONITOR->activeSpecialWorkspace = openSpecial; PMONITOR->activeWorkspace = startedOn; - startedOn->m_bVisible = true; + startedOn->m_visible = true; startedOn->startAnim(true, true, true); // zoom on the current workspace. @@ -254,19 +254,19 @@ void COverview::redrawID(int id, bool forcelowres) { if (openSpecial) pMonitor->activeSpecialWorkspace.reset(); - startedOn->m_bVisible = false; + startedOn->m_visible = false; if (PWORKSPACE) { pMonitor->activeWorkspace = PWORKSPACE; PWORKSPACE->startAnim(true, true, true); - PWORKSPACE->m_bVisible = true; + PWORKSPACE->m_visible = true; if (PWORKSPACE == startedOn) pMonitor->activeSpecialWorkspace = openSpecial; g_pHyprRenderer->renderWorkspace(pMonitor.lock(), PWORKSPACE, Time::steadyNow(), monbox); - PWORKSPACE->m_bVisible = false; + PWORKSPACE->m_visible = false; PWORKSPACE->startAnim(false, false, true); if (PWORKSPACE == startedOn) @@ -279,7 +279,7 @@ void COverview::redrawID(int id, bool forcelowres) { pMonitor->activeSpecialWorkspace = openSpecial; pMonitor->activeWorkspace = startedOn; - startedOn->m_bVisible = true; + startedOn->m_visible = true; startedOn->startAnim(true, true, true); blockOverviewRendering = false; diff --git a/hyprtrails/main.cpp b/hyprtrails/main.cpp index 4acc3aa..989d84f 100644 --- a/hyprtrails/main.cpp +++ b/hyprtrails/main.cpp @@ -94,7 +94,7 @@ void initGlobal() { g_pGlobalState->trailShader.posAttrib = glGetAttribLocation(prog, "pos"); g_pGlobalState->trailShader.gradient = glGetUniformLocation(prog, "snapshots"); - g_pGlobalState->tick = wl_event_loop_add_timer(g_pCompositor->m_sWLEventLoop, &onTick, nullptr); + g_pGlobalState->tick = wl_event_loop_add_timer(g_pCompositor->m_wlEventLoop, &onTick, nullptr); wl_event_source_timer_update(g_pGlobalState->tick, 1); } diff --git a/hyprtrails/trail.cpp b/hyprtrails/trail.cpp index 03e78b7..ed4ce4d 100644 --- a/hyprtrails/trail.cpp +++ b/hyprtrails/trail.cpp @@ -327,7 +327,7 @@ eDecorationType CTrail::getDecorationType() { void CTrail::updateWindow(PHLWINDOW pWindow) { const auto PWORKSPACE = pWindow->m_pWorkspace; - const auto WORKSPACEOFFSET = PWORKSPACE && !pWindow->m_bPinned ? PWORKSPACE->m_vRenderOffset->value() : Vector2D(); + const auto WORKSPACEOFFSET = PWORKSPACE && !pWindow->m_bPinned ? PWORKSPACE->m_renderOffset->value() : Vector2D(); m_vLastWindowPos = pWindow->m_vRealPosition->value() + WORKSPACEOFFSET; m_vLastWindowSize = pWindow->m_vRealSize->value(); diff --git a/hyprwinwrap/main.cpp b/hyprwinwrap/main.cpp index 96b1280..7551416 100644 --- a/hyprwinwrap/main.cpp +++ b/hyprwinwrap/main.cpp @@ -89,7 +89,7 @@ void onRenderStage(eRenderStage stage) { } void onCommitSubsurface(CSubsurface* thisptr) { - const auto PWINDOW = thisptr->m_pWLSurface->getWindow(); + const auto PWINDOW = thisptr->m_wlSurface->getWindow(); if (!PWINDOW || std::find_if(bgWindows.begin(), bgWindows.end(), [PWINDOW](const auto& ref) { return ref.lock() == PWINDOW; }) == bgWindows.end()) { ((origCommitSubsurface)subsurfaceHook->m_pOriginal)(thisptr);