tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2068 from TheRealLorenz/master

Browse Source
This commit is contained in:
Alex
2023-04-03 09:44:04 +02:00
committed by GitHub
parent 60467ad7f2 4b27385da2
commit a6084ea7e6
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/hyprland/window.cpp
View File

@ -8,7 +8,7 @@
#include "modules/hyprland/backend.hpp"
#include "util/command.hpp"
#include "util/json.hpp"
#include "util/rewrite_title.hpp"
#include "util/rewrite_string.hpp"
namespace waybar::modules::hyprland {
@ -41,7 +41,7 @@ auto Window::update() -> void {
if (!format_.empty()) {
label_.show();
label_.set_markup(fmt::format(fmt::runtime(format_),
waybar::util::rewriteTitle(lastView, config_["rewrite"])));
waybar::util::rewriteString(lastView, config_["rewrite"])));
} else {
label_.hide();
}

10
src/modules/sway/window.cpp
View File

@ -12,7 +12,7 @@
#include <regex>
#include <string>
#include "util/rewrite_title.hpp"
#include "util/rewrite_string.hpp"
namespace waybar::modules::sway {
@ -204,10 +204,10 @@ auto Window::update() -> void {
old_app_id_ = app_id_;
}
label_.set_markup(
fmt::format(fmt::runtime(format_),
fmt::arg("title", waybar::util::rewriteTitle(window_, config_["rewrite"])),
fmt::arg("app_id", app_id_), fmt::arg("shell", shell_)));
label_.set_markup(waybar::util::rewriteString(
fmt::format(fmt::runtime(format_), fmt::arg("title", window_), fmt::arg("app_id", app_id_),
fmt::arg("shell", shell_)),
config_["rewrite"]));
if (tooltipEnabled()) {
label_.set_tooltip_text(window_);
}