Skip to content
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

refactor/improve monitor mode selection #8804

Merged
merged 11 commits into from
Dec 28, 2024
+384 −425
Merged

refactor/improve monitor mode selection #8804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1af9fa3
refactor/improve monitor mode selection
ikalco Dec 22, 2024
8e9adcc
logs + add fallback on fail
ikalco Dec 22, 2024
28d0014
move applyMonitorRule from Renderer to CMonitor
ikalco Dec 22, 2024
42103b0
fix logs + fix trying INVALID format in modeset
ikalco Dec 22, 2024
44b9cae
fix fallback + add trying requested as custom fallback
ikalco Dec 22, 2024
6bbdd30
fix highrr and highres
ikalco Dec 23, 2024
dd3b0a7
better logs + cleanup
ikalco Dec 23, 2024
7030c98
make requested mode selection better
ikalco Dec 23, 2024
63d92eb
improve sorting logic + bring out func
ikalco Dec 23, 2024
f6065b7
fix addBest3Modes and use better sorting
ikalco Dec 23, 2024
0082267
all i want for christmas
ikalco Dec 28, 2024
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
2 changes: 1 addition & 1 deletion src/Compositor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ void CCompositor::initAllSignals() {

for (auto const& m : m_vMonitors) {
scheduleFrameForMonitor(m);
g_pHyprRenderer->applyMonitorRule(m, &m->activeMonitorRule, true);
m->applyMonitorRule(&m->activeMonitorRule, true);
}

g_pConfigManager->m_bWantsMonitorReload = true;
Expand Down
4 changes: 2 additions & 2 deletions src/config/ConfigManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1495,7 +1495,7 @@ void CConfigManager::performMonitorReload() {

auto rule = getMonitorRuleFor(m);

if (!g_pHyprRenderer->applyMonitorRule(m, &rule)) {
if (!m->applyMonitorRule(&rule)) {
overAgain = true;
break;
}
Expand Down Expand Up @@ -1553,7 +1553,7 @@ void CConfigManager::ensureMonitorStatus() {
auto rule = getMonitorRuleFor(rm);

if (rule.disabled == rm->m_bEnabled)
g_pHyprRenderer->applyMonitorRule(rm, &rule);
rm->applyMonitorRule(&rule);
}
}

Expand Down
Loading
Loading