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

tray: Rework tray spacing

Browse Source 
tray-padding determines space added before and after each icon
tray-spacing determines space added between icons (but not at the edge)

Both are an extent value and accept both pixel and point values.
This commit is contained in:
patrick96 2023-04-01 18:56:07 +02:00 committed by Patrick Ziegler
parent 7fbd2d175c
commit df32703a22
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/x11/tray_manager.hpp
View File

@ -122,7 +122,6 @@ class manager : public xpp::event::sink<evt::expose, evt::client_message, evt::c
int calculate_x() const; int calculate_x() const;
unsigned calculate_w() const; unsigned calculate_w() const;
unsigned calculate_w(unsigned count) const;
int calculate_client_y(); int calculate_client_y();

34
src/x11/tray_manager.cpp
View File

@ -52,8 +52,13 @@ manager::~manager() {
void manager::setup(const config& conf, const string& section_name) { void manager::setup(const config& conf, const string& section_name) {
unsigned bar_height = m_bar_opts.inner_area().height; unsigned bar_height = m_bar_opts.inner_area().height;
// Add user-defined padding // Spacing between icons
m_opts.spacing = conf.get<unsigned>(section_name, "tray-padding", 0); auto spacing = conf.get(section_name, "tray-spacing", ZERO_PX_EXTENT);
m_opts.spacing = units_utils::extent_to_pixel_nonnegative(spacing, m_bar_opts.dpi_x);
// Padding before and after each icon
auto padding = conf.get(section_name, "tray-padding", ZERO_PX_EXTENT);
m_opts.padding = units_utils::extent_to_pixel_nonnegative(padding, m_bar_opts.dpi_x);
auto size = conf.get(section_name, "tray-size", percentage_with_offset{66., ZERO_PX_EXTENT}); auto size = conf.get(section_name, "tray-size", percentage_with_offset{66., ZERO_PX_EXTENT});
unsigned client_height = std::min( unsigned client_height = std::min(
@ -71,6 +76,8 @@ void manager::setup(const config& conf, const string& section_name) {
m_opts.selection_owner = m_bar_opts.x_data.window; m_opts.selection_owner = m_bar_opts.x_data.window;
m_log.info("tray: spacing=%upx padding=%upx size=%upx", m_opts.spacing, m_opts.padding, client_height);
if (m_bar_opts.x_data.window == XCB_NONE) { if (m_bar_opts.x_data.window == XCB_NONE) {
m_log.err("tray: No bar window found, disabling tray"); m_log.err("tray: No bar window found, disabling tray");
return; return;
@ -233,8 +240,12 @@ void manager::recalculate_width() {
void manager::reconfigure_clients() { void manager::reconfigure_clients() {
m_log.trace("tray: Reconfigure clients"); m_log.trace("tray: Reconfigure clients");
// X-position of the start of the tray area
int base_x = calculate_x(); int base_x = calculate_x();
// X-position of the end of the previous tray icon (including padding)
unsigned x = 0;
bool has_error = false; bool has_error = false;
unsigned count = 0; unsigned count = 0;
@ -244,7 +255,11 @@ void manager::reconfigure_clients() {
client->ensure_state(); client->ensure_state();
if (client->mapped()) { if (client->mapped()) {
client->set_position(base_x + calculate_w(count), calculate_client_y()); // Calculate start of tray icon
unsigned client_x = x + (count > 0 ? m_opts.spacing : 0) + m_opts.padding;
client->set_position(base_x + client_x, calculate_client_y());
// Add size and padding to get the end position of the icon
x = client_x + m_opts.client_size.w + m_opts.padding;
count++; count++;
} }
} catch (const xpp::x::error::window& err) { } catch (const xpp::x::error::window& err) {
@ -260,6 +275,8 @@ void manager::reconfigure_clients() {
// Some clients may have been (un)mapped or even removed // Some clients may have been (un)mapped or even removed
recalculate_width(); recalculate_width();
// The final x position should match the width of the entire tray
assert(x == m_tray_width);
} }
/** /**
@ -434,15 +451,8 @@ unsigned manager::calculate_w() const {
unsigned count = unsigned count =
std::count_if(m_clients.begin(), m_clients.end(), [](const auto& client) { return client->mapped(); }); std::count_if(m_clients.begin(), m_clients.end(), [](const auto& client) { return client->mapped(); });
return calculate_w(count); if (count > 0) {
} return (count - 1) * m_opts.spacing + count * (2 * m_opts.padding + m_opts.client_size.w);
/**
* Calculates the width taken up by count tray icons in pixels
*/
unsigned manager::calculate_w(unsigned count) const {
if (count) {
return m_opts.spacing + count * (m_opts.spacing + m_opts.client_size.w);
} else { } else {
return 0; return 0;
} }