pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xworkspaces: Remove desktop offset member

Browse Source
This commit is contained in:
patrick96 2019-11-02 23:16:30 +01:00 committed by Patrick Ziegler
parent 7658c1b9f1
commit 0dffca98cb
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/modules/xworkspaces.hpp
View File

@ -33,10 +33,9 @@ namespace modules {
}; };
struct desktop { struct desktop {
explicit desktop(unsigned int index, unsigned int offset, desktop_state state, label_t&& label) explicit desktop(unsigned int index, desktop_state state, label_t&& label)
: index(index), offset(offset), state(state), label(label) {} : index(index), state(state), label(label) {}
unsigned int index; unsigned int index;
unsigned int offset;
desktop_state state; desktop_state state;
label_t label; label_t label;
}; };

6
src/modules/xworkspaces.cpp
View File

@ -225,7 +225,7 @@ namespace modules {
for (size_t i = 0; i < ws_positions.size(); i++) { for (size_t i = 0; i < ws_positions.size(); i++) {
auto&& ws_pos = ws_positions[i]; auto&& ws_pos = ws_positions[i];
if (ws_pos == viewport_pos) { if (ws_pos == viewport_pos) {
viewport->desktops.emplace_back(make_unique<struct desktop>(i, 0, desktop_state::EMPTY, label_t{})); viewport->desktops.emplace_back(make_unique<struct desktop>(i, desktop_state::EMPTY, label_t{}));
} }
} }
@ -255,7 +255,7 @@ namespace modules {
d->label = m_labels.at(d->state)->clone(); d->label = m_labels.at(d->state)->clone();
d->label->reset_tokens(); d->label->reset_tokens();
d->label->replace_token("%index%", to_string(d->index - d->offset + 1)); d->label->replace_token("%index%", to_string(d->index + 1));
d->label->replace_token("%name%", m_desktop_names[d->index]); d->label->replace_token("%name%", m_desktop_names[d->index]);
d->label->replace_token("%icon%", m_icons->get(m_desktop_names[d->index], DEFAULT_ICON)->get()); d->label->replace_token("%icon%", m_icons->get(m_desktop_names[d->index], DEFAULT_ICON)->get());
} }
@ -292,7 +292,7 @@ namespace modules {
d->label = m_labels.at(d->state)->clone(); d->label = m_labels.at(d->state)->clone();
d->label->reset_tokens(); d->label->reset_tokens();
d->label->replace_token("%index%", to_string(d->index - d->offset + 1)); d->label->replace_token("%index%", to_string(d->index + 1));
d->label->replace_token("%name%", m_desktop_names[d->index]); d->label->replace_token("%name%", m_desktop_names[d->index]);
d->label->replace_token("%icon%", m_icons->get(m_desktop_names[d->index], DEFAULT_ICON)->get()); d->label->replace_token("%icon%", m_icons->get(m_desktop_names[d->index], DEFAULT_ICON)->get());
return; return;