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

fix(renderer): Correct center module position (#673)

Browse Source 
The changes introduced in 389bae2669 to
address #551 did not consider the left border

Now center modules are centered regardless of border (left or right)
settings or tray position

Fixes #672
This commit is contained in:
Patrick Ziegler 2017-09-05 08:46:47 +02:00 committed by NBonaparte
parent e329a8150a
commit a255a022a7
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/components/renderer.cpp
View File

@ -399,11 +399,26 @@ double renderer::block_x(alignment a) const {
if ((min_pos = block_w(alignment::LEFT))) { if ((min_pos = block_w(alignment::LEFT))) {
min_pos += BLOCK_GAP; min_pos += BLOCK_GAP;
} }
if (m_rect.x > 0) {
base_pos -= (m_bar.size.w - m_rect.width) / 2.0;
} else {
base_pos += (m_bar.size.w - m_rect.width) / 2.0; base_pos += (m_bar.size.w - m_rect.width) / 2.0;
int border_left = m_bar.borders.at(edge::LEFT).size;
/*
* If m_rect.x is greater than the left border, then the systray is rendered on the left and we need to adjust for
* that.
* Since we cannot access any tray objects from here we need to calculate the tray size through m_rect.x
* m_rect.x is the x-position of the bar (without the tray or any borders), so if the tray is on the left,
* m_rect.x effectively is border_left + tray_width.
* So we can just subtract the tray_width = m_rect.x - border_left from the base_pos to correct for the tray being
* placed on the left
*/
if(m_rect.x > border_left) {
base_pos -= m_rect.x - border_left;
} }
base_pos -= border_left;
return std::max(base_pos - block_w(a) / 2.0, min_pos); return std::max(base_pos - block_w(a) / 2.0, min_pos);
} }
case alignment::RIGHT: { case alignment::RIGHT: {