mirror of
https://github.com/hyprwm/hyprland-plugins.git
synced 2025-05-12 21:30:37 +01:00
all: Change variable names to chase Hyprland (#324)
Some checks failed
Nix / build (push) Has been cancelled
Some checks failed
Nix / build (push) Has been cancelled
* flake.lock: update hyprland * all: Change variable names to chase Hyprland
This commit is contained in:
parent
bd929f71ef
commit
61ab0385c8
8 changed files with 18 additions and 18 deletions
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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": {
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue