Skip to content

fix(tabs): refresh tab highlight on monitor focus change #298

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
sim590 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(tabs): refresh tab highlight on monitor focus change #298

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
6 changes: 4 additions & 2 deletions src/TabGroup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,10 @@ void Hy3TabBar::updateNodeList(std::list<UP<Hy3Node>>& nodes) {
auto active = parent_focused && (parent_group.focused_child == node->get() || parent_group.group_focused);
entry->setActive(active);

auto last_monitor = Desktop::focusState()->monitor();
entry->setMonitorActive(active && (!last_monitor || (*node)->layout()->monitor() == last_monitor.get()));
auto focused_monitor = g_focusedMonitor.lock();
auto node_monitor = (*node)->layout()->monitor();
auto monitor_active = active && (!focused_monitor || node_monitor == focused_monitor.get());
entry->setMonitorActive(monitor_active);

entry->setUrgent((*node)->isUrgent());
entry->setWindowTitle((*node)->getTitle());
Expand Down
6 changes: 6 additions & 0 deletions src/globals.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,19 @@ inline bool g_suppressInsert = false;

inline std::set<Hy3Layout*> g_hy3Instances;

// Tracks the last focused monitor as reported by monitor.focused events.
// Desktop::focusState()->monitor() is unreliable during event callbacks
// because it may not yet reflect the new state.
inline PHLMONITORREF g_focusedMonitor;

inline std::vector<WP<Hy3TabGroup>> g_tabGroups;
inline std::vector<UP<Hy3TabGroup>> g_destroyingTabGroups;

inline CHyprSignalListener g_renderListener;
inline CHyprSignalListener g_tickListener;
inline CHyprSignalListener g_windowTitleListener;
inline CHyprSignalListener g_urgentListener;
inline CHyprSignalListener g_monitorFocusListener;

inline Hy3Layout* hy3InstanceForWorkspace(PHLWORKSPACE ws) {
if (!ws || !ws->m_space || !ws->m_space->algorithm()) return nullptr;
Expand Down
17 changes: 17 additions & 0 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,22 @@ APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
node->updateTabBarRecursive();
});

g_monitorFocusListener = Event::bus()->m_events.monitor.focused.listen([](PHLMONITOR monitor) {
// Store the focused monitor ourselves since
// Desktop::focusState()->monitor() is not yet updated when this fires.
g_focusedMonitor = monitor;

for (auto& mon: g_pCompositor->m_monitors) {
for (auto& ws: {mon->m_activeWorkspace, mon->m_activeSpecialWorkspace}) {
if (!ws) continue;
auto* hy3 = hy3InstanceForWorkspace(ws);
if (!hy3) continue;
auto* root = hy3->getWorkspaceRootGroup(ws.get());
if (root) root->updateDecos();
}
}
});

registerDispatchers();

HyprlandAPI::reloadConfig();
Expand All @@ -153,6 +169,7 @@ APICALL EXPORT void PLUGIN_EXIT() {
g_tickListener.reset();
g_windowTitleListener.reset();
g_urgentListener.reset();
g_monitorFocusListener.reset();

g_tabGroups.clear();
g_destroyingTabGroups.clear();
Expand Down