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>
87 lines
2.7 KiB
C++
87 lines
2.7 KiB
C++
#pragma once
|
|
|
|
#include <cassert>
|
|
|
|
#include "common.hpp"
|
|
#include "components/config.hpp"
|
|
#include "components/types.hpp"
|
|
#include "utils/mixins.hpp"
|
|
|
|
POLYBAR_NS
|
|
|
|
namespace drawtypes {
|
|
struct token {
|
|
string token;
|
|
size_t min{0_z};
|
|
size_t max{0_z};
|
|
string suffix{""s};
|
|
bool zpad{false};
|
|
};
|
|
|
|
class label : public non_copyable_mixin {
|
|
public:
|
|
rgba m_foreground{};
|
|
rgba m_background{};
|
|
rgba m_underline{};
|
|
rgba m_overline{};
|
|
int m_font{0};
|
|
side_values m_padding{ZERO_SPACE, ZERO_SPACE};
|
|
side_values m_margin{ZERO_SPACE, ZERO_SPACE};
|
|
|
|
size_t m_minlen{0};
|
|
/*
|
|
* If m_ellipsis is true, m_maxlen MUST be larger or equal to the length of
|
|
* the ellipsis (3), everything else is a programming error
|
|
*
|
|
* load_label should take care of this, but be aware, if you are creating
|
|
* labels in a different way.
|
|
*/
|
|
size_t m_maxlen{0_z};
|
|
alignment m_alignment{alignment::LEFT};
|
|
bool m_ellipsis{true};
|
|
|
|
explicit label(string text, int font) : m_font(font), m_text(move(text)), m_tokenized(m_text) {}
|
|
explicit label(string text, rgba foreground = rgba{}, rgba background = rgba{}, rgba underline = rgba{},
|
|
rgba overline = rgba{}, int font = 0, side_values padding = {ZERO_SPACE, ZERO_SPACE},
|
|
side_values margin = {ZERO_SPACE, ZERO_SPACE}, int minlen = 0, size_t maxlen = 0_z,
|
|
alignment label_alignment = alignment::LEFT, bool ellipsis = true, vector<token>&& tokens = {})
|
|
: m_foreground(move(foreground))
|
|
, m_background(move(background))
|
|
, m_underline(move(underline))
|
|
, m_overline(move(overline))
|
|
, m_font(font)
|
|
, m_padding(padding)
|
|
, m_margin(margin)
|
|
, m_minlen(minlen)
|
|
, m_maxlen(maxlen)
|
|
, m_alignment(label_alignment)
|
|
, m_ellipsis(ellipsis)
|
|
, m_text(move(text))
|
|
, m_tokenized(m_text)
|
|
, m_tokens(forward<vector<token>>(tokens)) {
|
|
assert(!m_ellipsis || (m_maxlen == 0 || m_maxlen >= 3));
|
|
}
|
|
|
|
string get() const;
|
|
explicit operator bool();
|
|
label_t clone();
|
|
void clear();
|
|
void reset_tokens();
|
|
void reset_tokens(const string& tokenized);
|
|
bool has_token(const string& token) const;
|
|
void replace_token(const string& token, string replacement);
|
|
void replace_defined_values(const label_t& label);
|
|
void copy_undefined(const label_t& label);
|
|
|
|
private:
|
|
string m_text{};
|
|
string m_tokenized{};
|
|
const vector<token> m_tokens{};
|
|
};
|
|
|
|
label_t load_label(const config& conf, const string& section, string name, bool required = true, string def = ""s);
|
|
label_t load_optional_label(const config& conf, string section, string name, string def = ""s);
|
|
} // namespace drawtypes
|
|
|
|
POLYBAR_NS_END
|