Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: simplify complex conditional expressions in Hyprland workspace module

Browse Source
This commit is contained in:
Visal Vijay
2026-04-09 19:40:05 +05:30
parent 1e965ccce0
commit a8a46d1f1e
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/hyprland/workspace.cpp
+16 -5
View File
@@ -115,7 +115,11 @@ void Workspace::setActiveWindow(WindowAddress const& addr) {
} }
auto activeWindowPos = m_workspaceManager.activeWindowPosition(); auto activeWindowPos = m_workspaceManager.activeWindowPosition();
if (activeIdx.has_value() && activeWindowPos != Workspaces::ActiveWindowPosition::NONE) { const bool has_active_window =
activeIdx.has_value() &&
activeWindowPos != Workspaces::ActiveWindowPosition::NONE;
if (has_active_window) {
auto window = std::move(m_windowMap[*activeIdx]); auto window = std::move(m_windowMap[*activeIdx]);
m_windowMap.erase(m_windowMap.begin() + *activeIdx); m_windowMap.erase(m_windowMap.begin() + *activeIdx);
if (activeWindowPos == Workspaces::ActiveWindowPosition::FIRST) { if (activeWindowPos == Workspaces::ActiveWindowPosition::FIRST) {
@@ -130,7 +134,10 @@ void Workspace::insertWindow(WindowCreationPayload create_window_payload) {
if (!create_window_payload.isEmpty(m_workspaceManager)) { if (!create_window_payload.isEmpty(m_workspaceManager)) {
auto repr = create_window_payload.repr(m_workspaceManager); auto repr = create_window_payload.repr(m_workspaceManager);
if (!repr.empty() || m_workspaceManager.enableTaskbar()) { const bool should_display =
!repr.empty() || m_workspaceManager.enableTaskbar();
if (should_display) {
auto addr = create_window_payload.getAddress(); auto addr = create_window_payload.getAddress();
auto it = std::ranges::find_if( auto it = std::ranges::find_if(
m_windowMap, [&addr](const auto& window) { return window.address == addr; }); m_windowMap, [&addr](const auto& window) { return window.address == addr; });
@@ -142,7 +149,7 @@ void Workspace::insertWindow(WindowCreationPayload create_window_payload) {
} }
} }
} }
}; }
bool Workspace::onWindowOpened(WindowCreationPayload const& create_window_payload) { bool Workspace::onWindowOpened(WindowCreationPayload const& create_window_payload) {
if (create_window_payload.getWorkspaceName() == name()) { if (create_window_payload.getWorkspaceName() == name()) {
@@ -270,7 +277,9 @@ void Workspace::update(const std::string& workspace_icon) {
bool Workspace::isEmpty() const { bool Workspace::isEmpty() const {
auto ignore_list = m_workspaceManager.getIgnoredWindows(); auto ignore_list = m_workspaceManager.getIgnoredWindows();
if (ignore_list.empty()) { const bool no_ignore_rules = ignore_list.empty();
if (no_ignore_rules) {
return m_windows == 0; return m_windows == 0;
} }
// If there are windows but they are all ignored, consider the workspace empty // If there are windows but they are all ignored, consider the workspace empty
@@ -349,7 +358,9 @@ void Workspace::updateTaskbar(const std::string& workspace_icon) {
} }
auto formatAfter = m_workspaceManager.formatAfter(); auto formatAfter = m_workspaceManager.formatAfter();
if (!formatAfter.empty()) { const bool has_format_after = !formatAfter.empty();
if (has_format_after) {
m_labelAfter.set_markup(fmt::format(fmt::runtime(formatAfter), fmt::arg("id", id()), m_labelAfter.set_markup(fmt::format(fmt::runtime(formatAfter), fmt::arg("id", id()),
fmt::arg("name", name()), fmt::arg("name", name()),
fmt::arg("icon", workspace_icon))); fmt::arg("icon", workspace_icon)));