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

fix(tray): correctly compute background for tray if bar pos != (0,0)

Browse source 
We need to use positions relative to the position of the bar for indexing into
the background image slice, but the code used absolute ones.

This worked fine as long as absolute positions are the same as relative
positions (this is the case for a bar located at (0,0), so if bottom = false).
But for bottom bars (where the bar position is not (0,0)) this was wrong which
caused the tray background to be black (out of bounds for the background slice).
This commit is contained in:
Benno Fünfstück 2018-08-08 14:33:48 +02:00 committed by Patrick Ziegler
parent eacf5ce5ba
commit 35aca5b368
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/x11/tray_manager.hpp
View file

@ -42,6 +42,8 @@ struct tray_settings {
alignment align{alignment::NONE};
bool running{false};
int rel_x{0};
int rel_y{0};
int orig_x{0};
int orig_y{0};
int configured_x{0};
@ -102,8 +104,8 @@ class tray_manager
void track_selection_owner(xcb_window_t owner);
void process_docking_request(xcb_window_t win);
int calculate_x(unsigned width) const;
int calculate_y() const;
int calculate_x(unsigned width, bool abspos = true) const;
int calculate_y(bool abspos = true) const;
unsigned int calculate_w() const;
unsigned int calculate_h() const;

14
src/x11/tray_manager.cpp
View file

@ -161,6 +161,8 @@ void tray_manager::setup(const bar_settings& bar_opts) {
m_opts.orig_x += offset_x;
m_opts.orig_y += offset_y;
m_opts.rel_x = m_opts.orig_x - bar_opts.pos.x;
m_opts.rel_y = m_opts.orig_y - bar_opts.pos.y;
// Put the tray next to the bar in the window stack
m_opts.sibling = bar_opts.window;
@ -383,8 +385,8 @@ void tray_manager::reconfigure_bg(bool realloc) {
auto w = calculate_w();
auto x = calculate_x(w);
auto y = calculate_y();
auto x = calculate_x(w, false);
auto y = calculate_y(false);
if(!m_context) {
return m_log.err("tray: no context for drawing the background");
@ -764,8 +766,8 @@ void tray_manager::process_docking_request(xcb_window_t win) {
/**
* Calculate x position of tray window
*/
int tray_manager::calculate_x(unsigned int width) const {
auto x = m_opts.orig_x;
int tray_manager::calculate_x(unsigned int width, bool abspos) const {
auto x = abspos ? m_opts.orig_x : m_opts.rel_x;
if (m_opts.align == alignment::RIGHT) {
x -= ((m_opts.width + m_opts.spacing) * m_clients.size() + m_opts.spacing);
} else if (m_opts.align == alignment::CENTER) {
@ -777,8 +779,8 @@ int tray_manager::calculate_x(unsigned int width) const {
/**
* Calculate y position of tray window
*/
int tray_manager::calculate_y() const {
return m_opts.orig_y;
int tray_manager::calculate_y(bool abspos) const {
return abspos ? m_opts.orig_y : m_opts.rel_y;
}
/**