Skip to content

fix: focused window content disappearance in overview #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Weicao-CatilGrass wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: focused window content disappearance in overview #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/Globals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,27 @@ namespace Config {
extern bool disableBlur;
extern float overrideAnimSpeed;
extern float dragAlpha;

extern bool enableFocusedWindowPlaceholder;
extern CHyprColor focusedWindowPlaceholderColor;
extern CHyprColor focusedWindowPlaceholderBorderColor;
extern float focusedWindowPlaceholderAlpha;

extern bool showFocusedWindowContent;
}

// Texture capture system
struct CachedWindowTexture {
std::shared_ptr<void> texture; // Will be cast to appropriate texture type
uint64_t lastUpdateTime;
CBox lastBounds;
bool isValid;
};

extern std::unordered_map<PHLWINDOW, CachedWindowTexture> g_windowTextureCache;
extern bool g_enableTextureCapture;

// Texture capture function prototype
bool captureWindowTexture(PHLWINDOW pWindow, PHLMONITOR pMonitor, const CBox& targetBox);

extern int numWorkspaces;
128 changes: 122 additions & 6 deletions src/Render.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,50 @@ void renderWindowStub(PHLWINDOW pWindow, PHLMONITOR pMonitor, PHLWORKSPACE pWork
g_pInputManager->m_dragMode = oDragMode;
}

// Special rendering function for focused windows that minimizes state changes
void renderFocusedWindowStub(PHLWINDOW pWindow, PHLMONITOR pMonitor, PHLWORKSPACE pWorkspaceOverride, CBox rectOverride, timespec* time) {
if (!pWindow || !pMonitor || !pWorkspaceOverride || !time) return;

// Save minimal state - only what's absolutely necessary
const auto oWorkspace = pWindow->m_workspace;
const auto oFullscreen = pWindow->m_fullscreenState;
const auto oPinned = pWindow->m_pinned;
const auto oUseNearestNeighbor = pWindow->m_windowData.nearestNeighbor;

// Apply minimal state changes for preview rendering
pWindow->m_workspace = pWorkspaceOverride;
pWindow->m_fullscreenState = SFullscreenState{FSMODE_NONE};
pWindow->m_windowData.nearestNeighbor = false;
pWindow->m_pinned = true;

// Use render modification for position and scale without touching window properties
SRenderModifData renderModif;
const auto oRealPosition = pWindow->m_realPosition->value();
const auto oSize = pWindow->m_realSize->value();
const float curScaling = rectOverride.w / (oSize.x * pMonitor->m_scale);

renderModif.modifs.push_back({SRenderModifData::eRenderModifType::RMOD_TYPE_TRANSLATE,
(pMonitor->m_position * pMonitor->m_scale) + (rectOverride.pos() / curScaling) - (oRealPosition * pMonitor->m_scale)});
renderModif.modifs.push_back({SRenderModifData::eRenderModifType::RMOD_TYPE_SCALE, curScaling});
renderModif.enabled = true;

g_pHyprRenderer->m_renderPass.add(makeUnique<CRendererHintsPassElement>(CRendererHintsPassElement::SData{renderModif}));

// Auto-cleanup render modif
Hyprutils::Utils::CScopeGuard x([] {
g_pHyprRenderer->m_renderPass.add(makeUnique<CRendererHintsPassElement>(CRendererHintsPassElement::SData{SRenderModifData{}}));
});

// Render the window with minimal damage
(*(tRenderWindow)pRenderWindow)(g_pHyprRenderer.get(), pWindow, pMonitor, time, true, RENDER_PASS_ALL, false, false);

// Restore only the essential state
pWindow->m_workspace = oWorkspace;
pWindow->m_fullscreenState = oFullscreen;
pWindow->m_windowData.nearestNeighbor = oUseNearestNeighbor;
pWindow->m_pinned = oPinned;
}

void renderLayerStub(PHLLS pLayer, PHLMONITOR pMonitor, CBox rectOverride, timespec* time) {
if (!pLayer || !pMonitor || !time) return;

Expand Down Expand Up @@ -343,8 +387,32 @@ void CHyprspaceWidget::draw() {
if (!(wW > 0 && wH > 0)) continue;
CBox curWindowBox = {wX, wY, wW, wH};
g_pHyprOpenGL->m_renderData.clipBox = curWorkspaceBox;
//g_pHyprOpenGL->renderRectWithBlur(&curWindowBox, CHyprColor(0, 0, 0, 0));
renderWindowStub(w, owner, owner->m_activeWorkspace, curWindowBox, &time);

// For focused windows, choose rendering method based on config
if (w == g_pCompositor->m_lastWindow.lock()) {
if (Config::showFocusedWindowContent) {
// Try to show actual window content (experimental)
renderFocusedWindowStub(w, owner, owner->m_activeWorkspace, curWindowBox, &time);
} else if (Config::enableFocusedWindowPlaceholder) {
// Use placeholder rendering (safe default)
CHyprColor placeholderColor = Config::focusedWindowPlaceholderColor;
CHyprColor borderColor = Config::focusedWindowPlaceholderBorderColor;

if (!Config::disableBlur) {
renderRectWithBlur(curWindowBox, placeholderColor);
} else {
renderRect(curWindowBox, placeholderColor);
}

// Add a border to indicate it's the focused window
if (Config::workspaceBorderSize > 0) {
renderBorder(curWindowBox, CGradientValueData(borderColor), Config::workspaceBorderSize);
}
}
} else {
//g_pHyprOpenGL->renderRectWithBlur(&curWindowBox, CHyprColor(0, 0, 0, 0));
renderWindowStub(w, owner, owner->m_activeWorkspace, curWindowBox, &time);
}
g_pHyprOpenGL->m_renderData.clipBox = CBox();
}
}
Expand All @@ -359,8 +427,32 @@ void CHyprspaceWidget::draw() {
if (!(wW > 0 && wH > 0)) continue;
CBox curWindowBox = {wX, wY, wW, wH};
g_pHyprOpenGL->m_renderData.clipBox = curWorkspaceBox;
//g_pHyprOpenGL->renderRectWithBlur(&curWindowBox, CHyprColor(0, 0, 0, 0));
renderWindowStub(w, owner, owner->m_activeWorkspace, curWindowBox, &time);

// For focused windows, choose rendering method based on config
if (w == g_pCompositor->m_lastWindow.lock()) {
if (Config::showFocusedWindowContent) {
// Try to show actual window content (experimental)
renderFocusedWindowStub(w, owner, owner->m_activeWorkspace, curWindowBox, &time);
} else if (Config::enableFocusedWindowPlaceholder) {
// Use placeholder rendering (safe default)
CHyprColor placeholderColor = Config::focusedWindowPlaceholderColor;
CHyprColor borderColor = Config::focusedWindowPlaceholderBorderColor;

if (!Config::disableBlur) {
renderRectWithBlur(curWindowBox, placeholderColor);
} else {
renderRect(curWindowBox, placeholderColor);
}

// Add a border to indicate it's the focused window
if (Config::workspaceBorderSize > 0) {
renderBorder(curWindowBox, CGradientValueData(borderColor), Config::workspaceBorderSize);
}
}
} else {
//g_pHyprOpenGL->renderRectWithBlur(&curWindowBox, CHyprColor(0, 0, 0, 0));
renderWindowStub(w, owner, owner->m_activeWorkspace, curWindowBox, &time);
}
g_pHyprOpenGL->m_renderData.clipBox = CBox();
}
}
Expand All @@ -375,8 +467,32 @@ void CHyprspaceWidget::draw() {
if (!(wW > 0 && wH > 0)) continue;
CBox curWindowBox = {wX, wY, wW, wH};
g_pHyprOpenGL->m_renderData.clipBox = curWorkspaceBox;
//g_pHyprOpenGL->renderRectWithBlur(&curWindowBox, CHyprColor(0, 0, 0, 0));
renderWindowStub(w, owner, owner->m_activeWorkspace, curWindowBox, &time);

// For focused windows, choose rendering method based on config
if (w == g_pCompositor->m_lastWindow.lock()) {
if (Config::showFocusedWindowContent) {
// Try to show actual window content (experimental)
renderFocusedWindowStub(w, owner, owner->m_activeWorkspace, curWindowBox, &time);
} else if (Config::enableFocusedWindowPlaceholder) {
// Use placeholder rendering (safe default)
CHyprColor placeholderColor = Config::focusedWindowPlaceholderColor;
CHyprColor borderColor = Config::focusedWindowPlaceholderBorderColor;

if (!Config::disableBlur) {
renderRectWithBlur(curWindowBox, placeholderColor);
} else {
renderRect(curWindowBox, placeholderColor);
}

// Add a border to indicate it's the focused window
if (Config::workspaceBorderSize > 0) {
renderBorder(curWindowBox, CGradientValueData(borderColor), Config::workspaceBorderSize);
}
}
} else {
//g_pHyprOpenGL->renderRectWithBlur(&curWindowBox, CHyprColor(0, 0, 0, 0));
renderWindowStub(w, owner, owner->m_activeWorkspace, curWindowBox, &time);
}
g_pHyprOpenGL->m_renderData.clipBox = CBox();
}
}
Expand Down
14 changes: 13 additions & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,20 @@ bool Config::disableBlur = false;

float Config::overrideAnimSpeed = 0;

bool Config::enableFocusedWindowPlaceholder = true;
CHyprColor Config::focusedWindowPlaceholderColor = CHyprColor(0.3f, 0.3f, 0.3f, 0.5f);
CHyprColor Config::focusedWindowPlaceholderBorderColor = CHyprColor(0.8f, 0.8f, 0.8f, 0.8f);
float Config::focusedWindowPlaceholderAlpha = 0.5;

bool Config::showFocusedWindowContent = false;

float Config::dragAlpha = 0.2;


// Texture capture system globals
std::unordered_map<PHLWINDOW, CachedWindowTexture> g_windowTextureCache;
bool g_enableTextureCapture = false;

int numWorkspaces = -1; //hyprsplit/split-monitor-workspaces support

Hyprutils::Memory::CSharedPointer<HOOK_CALLBACK_FN> g_pRenderHook;
Expand Down Expand Up @@ -429,7 +441,7 @@ void reloadConfig() {
Config::disableBlur = std::any_cast<Hyprlang::INT>(HyprlandAPI::getConfigValue(pHandle, "plugin:overview:disableBlur")->getValue());

Config::overrideAnimSpeed = std::any_cast<Hyprlang::FLOAT>(HyprlandAPI::getConfigValue(pHandle, "plugin:overview:overrideAnimSpeed")->getValue());

// We don't need to store exitKey in Config namespace as it's only used in onKeyPress

for (auto& widget : g_overviewWidgets) {
Expand Down