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>
75 lines
2.0 KiB
C++
75 lines
2.0 KiB
C++
#pragma once
|
|
|
|
#include <map>
|
|
|
|
#include "common.hpp"
|
|
#include "components/types.hpp"
|
|
#include "tags/types.hpp"
|
|
POLYBAR_NS
|
|
|
|
using std::map;
|
|
|
|
// fwd decl
|
|
using namespace drawtypes;
|
|
namespace modules {
|
|
struct module_interface;
|
|
}
|
|
|
|
class builder {
|
|
public:
|
|
explicit builder(const bar_settings& bar);
|
|
|
|
void reset();
|
|
string flush();
|
|
void append(const string& text);
|
|
void node(const string& str);
|
|
void node(const string& str, int font_index);
|
|
void node(const label_t& label);
|
|
void node_repeat(const string& str, size_t n);
|
|
void node_repeat(const label_t& label, size_t n);
|
|
void offset(extent_val pixels = ZERO_PX_EXTENT);
|
|
void spacing(spacing_val size);
|
|
void font(int index);
|
|
void font_close();
|
|
void background(rgba color);
|
|
void background_close();
|
|
void color(rgba color);
|
|
void color_close();
|
|
void line_color(const rgba& color);
|
|
void line_color_close();
|
|
void overline_color(rgba color);
|
|
void overline_color_close();
|
|
void underline_color(rgba color);
|
|
void underline_color_close();
|
|
void overline(const rgba& color = rgba{});
|
|
void overline_close();
|
|
void underline(const rgba& color = rgba{});
|
|
void underline_close();
|
|
void control(tags::controltag tag);
|
|
void action(mousebtn index, string action);
|
|
void action(mousebtn btn, const modules::module_interface& module, string action, string data);
|
|
void action(mousebtn index, string action, const label_t& label);
|
|
void action(mousebtn btn, const modules::module_interface& module, string action, string data, const label_t& label);
|
|
void action_close();
|
|
|
|
static string get_spacing_format_string(const spacing_val& space);
|
|
|
|
protected:
|
|
void tag_open(tags::syntaxtag tag, const string& value);
|
|
void tag_open(tags::attribute attr);
|
|
void tag_close(tags::syntaxtag tag);
|
|
void tag_close(tags::attribute attr);
|
|
|
|
private:
|
|
const bar_settings m_bar;
|
|
string m_output;
|
|
|
|
map<tags::syntaxtag, int> m_tags{};
|
|
map<tags::syntaxtag, string> m_colors{};
|
|
map<tags::attribute, bool> m_attrs{};
|
|
|
|
int m_fontindex{0};
|
|
};
|
|
|
|
POLYBAR_NS_END
|