cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dekstop/window: read static rules before guessing initial size if possible (#12783)

Browse source
This commit is contained in:
Vaxry 2026-01-01 21:49:57 +01:00 • committed by GitHub
parent 9b93d621b1
commit 31d3181e1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 45 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/desktop/rule/matchEngine/WorkspaceMatchEngine.cpp
View file

@ -8,5 +8,5 @@ CWorkspaceMatchEngine::CWorkspaceMatchEngine(const std::string& s) : m_value(s)
}
bool CWorkspaceMatchEngine::match(PHLWORKSPACE ws) {
return ws->matchesStaticSelector(m_value);
return ws && ws->matchesStaticSelector(m_value);
}

5
src/desktop/rule/windowRule/WindowRuleApplicator.cpp
View file

@ -537,7 +537,7 @@ CWindowRuleApplicator::SRuleResult CWindowRuleApplicator::applyStaticRule(const
return SRuleResult{};
}
void CWindowRuleApplicator::readStaticRules() {
void CWindowRuleApplicator::readStaticRules(bool preRead) {
if (!m_window)
return;
@ -592,7 +592,8 @@ void CWindowRuleApplicator::readStaticRules() {
for (const auto& wr : execRules) {
applyStaticRule(wr);
applyDynamicRule(wr);
ruleEngine()->unregisterRule(wr);
if (!preRead)
ruleEngine()->unregisterRule(wr);
}
}

3
src/desktop/rule/windowRule/WindowRuleApplicator.hpp
View file

@ -33,8 +33,7 @@ namespace Desktop::Rule {
void propertiesChanged(std::underlying_type_t<eRuleProperty> props);
std::unordered_set<CWindowRuleEffectContainer::storageType> resetProps(std::underlying_type_t<eRuleProperty> props,
Types::eOverridePriority prio = Types::PRIORITY_WINDOW_RULE);
void readStaticRules();
void applyStaticRules();
void readStaticRules(bool preRead = false);
// static props
struct {

3
src/desktop/view/Window.cpp
View file

@ -2546,6 +2546,9 @@ void CWindow::unmapWindow() {
void CWindow::commitWindow() {
if (!m_isX11 && m_xdgSurface->m_initialCommit) {
// try to calculate static rules already for any floats
m_ruleApplicator->readStaticRules(true);
Vector2D predSize = g_pLayoutManager->getCurrentLayout()->predictSizeForNewWindow(m_self.lock());
Log::logger->log(Log::DEBUG, "Layout predicts size {} for {}", predSize, m_self.lock());