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

fix(renderer): make center position more robust

Browse Source 
The old code didn't really work when the right block was pushing against
the center block. Also `fixed-center` wasn't properly defined. I have
now fixed it to the following:

* `fixed-center = true`: The center block stays at the center of the bar
whenever possible. It can be pushed to the left if the right block takes
too much space and to the right if the left block takes too much space
* `fixed-center = false`: The center block will be in the middle between
the left and right block whenever possible. If there is not enough space
between those two, the center block will be directly to the right of the
left block and pushes out the right block
This commit is contained in:
patrick96 2019-11-22 03:23:38 +01:00 committed by Patrick Ziegler
parent 00274c57a9
commit 63cb05d35d
1 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/components/renderer.cpp
View File

@ -433,40 +433,61 @@ void renderer::flush() {
/** /**
* Get x position of block for given alignment * Get x position of block for given alignment
*
* The position is relative to m_rect.x (the left side of the bar w/o borders and tray)
*/ */
double renderer::block_x(alignment a) const { double renderer::block_x(alignment a) const {
switch (a) { switch (a) {
case alignment::CENTER: { case alignment::CENTER: {
double base_pos{0.0}; // The leftmost x position this block can start at
double min_pos{0.0}; double min_pos = block_w(alignment::LEFT);
if (!m_fixedcenter || m_rect.width / 2.0 + block_w(a) / 2.0 > m_rect.width - block_w(alignment::RIGHT)) {
base_pos = (m_rect.width - block_w(alignment::RIGHT) + block_w(alignment::LEFT)) / 2.0; if (min_pos != 0) {
} else {
base_pos = m_rect.width / 2.0;
}
if ((min_pos = block_w(alignment::LEFT))) {
min_pos += BLOCK_GAP; min_pos += BLOCK_GAP;
} }
base_pos += (m_bar.size.w - m_rect.width) / 2.0; double right_width = block_w(alignment::RIGHT);
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 * The rightmost x position this block can end at
* that. *
* Since we cannot access any tray objects from here we need to calculate the tray size through m_rect.x * We can't use block_x(alignment::RIGHT) because that would lead to infinite recursion
* 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) { double max_pos = m_rect.width - right_width;
base_pos -= m_rect.x - border_left;
if (right_width != 0) {
max_pos -= BLOCK_GAP;
} }
base_pos -= border_left; /*
* x position of the center of this block
*
* With fixed-center this will be the center of the bar unless it is pushed to the left by a large right block
* Without fixed-center this will be the middle between the end of the left and the start of the right block.
*/
double base_pos{0.0};
if (m_fixedcenter) {
/*
* This is in the middle of the *bar*. Not just the middle of m_rect because this way we need to account for the
* tray.
*
* The resulting position is relative to the very left of the bar (including border and tray), so we need to
* compensate for that by subtracting m_rect.x
*/
base_pos = m_bar.size.w / 2.0 - m_rect.x;
/*
* The center block can be moved to the left if the right block is too large
*/
base_pos = std::min(base_pos, max_pos - block_w(a) / 2.0);
}
else {
base_pos = (min_pos + max_pos) / 2.0;
}
/*
* The left block always has priority (even with fixed-center = true)
*/
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: {