mirror of
https://github.com/polybar/polybar.git
synced 2024-11-18 13:55:11 -05:00
ce93188a4a
* add units support (POINT, PIXEL, SPACE) for polybar - add a size_with_unit struct - add a geometry_format_values struct - move dpi initialisation from renderer.cpp to bar.cpp - add a string to size_with_unit converter - add point support (with pt) - add pixel support (with px) * Fix unit test compilation * clang-format * Better names The old names didn't really capture the purpose of the structs and function. space_type -> spacing_type space_size -> spacing_val size_type -> extent_type geometry -> extent_val geometry_format_values -> percentage_with_offset * Remove parse_size_with_unit No longer needed. The convert<spacing_val> function in config.cpp already does all the work for us and always setting the type to pixel was wrong. In addition, line-size should not be of type spacing_val but extent_val. * Cleanup I tried to address most of my comments on the old PR * Fix renderer width calculation We can't just blindly add the x difference to the width because for example the width should increase if x < width and the increase keeps x < width. Similarly, we can't just add the offset to the width. * Rename geom_format_to_pixels to percentage_with_offset_to_pixel * Cleanup * Apply suggested changes from Patrick on GitHub Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com> * Update src/components/bar.cpp Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com> * Update src/components/config.cpp Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com> * Update src/components/builder.cpp Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com> * Update src/components/builder.cpp Co-authored-by: Patrick Ziegler <p.ziegler96@gmail.com> * config: Use stod for parsing percentage * Use stof instead of strtof * units: Fix test edge cases * Remove unnecessary clang-format toggle * Use percentage_with_offset for margin-{top,bottom} * Support negative extent values * Rename unit to units and create a cpp file * Move percentage_with_offset_to_pixel unit test to units * Add unit tests for units_utils * Clarify when and how negative spacing/extent is allowed Negative spacing is never allowed and produces a config error. Extents allow negative values in theory, but only a few use-cases accept it. Only the extent value used for the `%{O}` tag and the offset value in percentage_with_offset can be negative. Everything else is capped below at 0. The final pixel value of percentage_with_offset also caps below at 0. * Fix parsing errors not being caught in config * Print a proper error message for uncaught exceptions * Cleanup module::get_output All changes preserve the existing semantics * Stop using remove_trailing_space in module::get_output Instead, we first check if the current tag is built, and only if it is, the spacing is prepended. * Remove unused imports * Restore old behavior If there are two tags and the second one isn't built (module::build returns false), the space in between them is removed. For example in the mpd module: format-online = <toggle> <label-song> foo If mpd is not running, the mpd module will return false when trying to build the `<label-song>` tag. If we don't remove the space between `<toggle>` and `<label-song>`, we end up with two spaces between `<toggle>` and `foo`. This change is to match the old behavior where at least one trailing space character was removed from the builder. * Add changelog entry * Remove unused setting * Use percentage with offset for tray-offset Co-authored-by: Jérôme BOULMIER <jerome.boulmier@outlook.fr> Co-authored-by: Joe Groocock <github@frebib.net>
43 lines
1.3 KiB
C++
43 lines
1.3 KiB
C++
#pragma once
|
|
#include <map>
|
|
|
|
#include "common.hpp"
|
|
#include "tags/action_context.hpp"
|
|
#include "tags/context.hpp"
|
|
POLYBAR_NS
|
|
|
|
class renderer_interface {
|
|
public:
|
|
renderer_interface(const tags::action_context& action_ctxt) : m_action_ctxt(action_ctxt){};
|
|
|
|
virtual void render_offset(const tags::context& ctxt, const extent_val offset) = 0;
|
|
virtual void render_text(const tags::context& ctxt, const string&& str) = 0;
|
|
virtual void change_alignment(const tags::context& ctxt) = 0;
|
|
|
|
/**
|
|
* Get the current x-coordinate of the renderer.
|
|
*
|
|
* This position denotes the coordinate where the next thing will be rendered.
|
|
* It is relative to the start of the current alignment because the absolute
|
|
* positions may not be known until after the renderer has finished.
|
|
*/
|
|
virtual double get_x(const tags::context& ctxt) const = 0;
|
|
|
|
/**
|
|
* Get the absolute x-position of the start of an alignment block.
|
|
*
|
|
* The position is absolute in terms of the bar window.
|
|
*
|
|
* Only call this after all the rendering is finished as these values change
|
|
* when new things are rendered.
|
|
*/
|
|
virtual double get_alignment_start(const alignment align) const = 0;
|
|
|
|
protected:
|
|
/**
|
|
* Stores information about actions in the current render cycle.
|
|
*/
|
|
const tags::action_context& m_action_ctxt;
|
|
};
|
|
|
|
POLYBAR_NS_END
|