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>
79 lines
2.3 KiB
CMake
79 lines
2.3 KiB
CMake
# Download and unpack googletest at configure time {{{
|
|
configure_file(
|
|
CMakeLists.txt.in
|
|
${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt
|
|
)
|
|
execute_process( COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
|
|
RESULT_VARIABLE result
|
|
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download)
|
|
|
|
if(result)
|
|
message(FATAL_ERROR "CMake step for googletest failed: ${result}")
|
|
endif()
|
|
|
|
execute_process(COMMAND ${CMAKE_COMMAND} --build .
|
|
RESULT_VARIABLE result
|
|
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
|
|
|
|
if(result)
|
|
message(FATAL_ERROR "Build step for googletest failed: ${result}")
|
|
endif()
|
|
|
|
# Add googletest directly to our build. This defines
|
|
# the gtest, gtest_main, gmock and gmock_main targets.
|
|
add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src
|
|
${CMAKE_BINARY_DIR}/googletest-build
|
|
EXCLUDE_FROM_ALL)
|
|
|
|
# }}}
|
|
|
|
# Compile all unit tests with 'make all_unit_tests'
|
|
add_custom_target(all_unit_tests
|
|
COMMENT "Building all unit test")
|
|
|
|
function(add_unit_test source_file)
|
|
string(REPLACE "/" "_" testname ${source_file})
|
|
set(name "unit_test.${testname}")
|
|
|
|
add_executable(${name} unit_tests/${source_file}.cpp)
|
|
get_include_dirs(includes_dir)
|
|
target_include_directories(${name} PRIVATE ${includes_dir} ${CMAKE_CURRENT_LIST_DIR})
|
|
|
|
# Link against gmock (this automatically links against gtest)
|
|
target_link_libraries(${name} poly gmock_main)
|
|
add_test(NAME ${name} COMMAND ${name})
|
|
|
|
add_dependencies(all_unit_tests ${name})
|
|
endfunction()
|
|
|
|
add_unit_test(utils/actions)
|
|
add_unit_test(utils/action_router)
|
|
add_unit_test(utils/color)
|
|
add_unit_test(utils/command)
|
|
add_unit_test(utils/env)
|
|
add_unit_test(utils/math)
|
|
add_unit_test(utils/memory)
|
|
add_unit_test(utils/scope)
|
|
add_unit_test(utils/string)
|
|
add_unit_test(utils/file)
|
|
add_unit_test(utils/process)
|
|
add_unit_test(utils/units)
|
|
add_unit_test(components/command_line)
|
|
add_unit_test(components/config_parser)
|
|
add_unit_test(drawtypes/label)
|
|
add_unit_test(drawtypes/ramp)
|
|
add_unit_test(drawtypes/iconset)
|
|
add_unit_test(drawtypes/layouticonset)
|
|
add_unit_test(ipc/decoder)
|
|
add_unit_test(ipc/encoder)
|
|
add_unit_test(ipc/util)
|
|
add_unit_test(tags/parser)
|
|
add_unit_test(tags/dispatch)
|
|
add_unit_test(tags/action_context)
|
|
|
|
# Run make check to build and run all unit tests
|
|
add_custom_target(check
|
|
COMMAND GTEST_COLOR=1 ctest --output-on-failure
|
|
DEPENDS all_unit_tests
|
|
)
|