RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master

pull/1002/head
nullobsi 2021-01-31 12:01:49 -08:00 committed by GitHub
parent 6cc3212605 be777b8525
commit 35062ceb99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/waybar-bluetooth.5.scd
View File

@ -85,7 +85,7 @@ Addressed by *bluetooth*
"enabled": "", "enabled": "",
"disabled": "" "disabled": ""
}, },
"tooltip-format": "{status}" "tooltip-format": "{}"
} }
``` ```

30
src/modules/wlr/taskbar.cpp
View File

@ -26,19 +26,19 @@ const std::string WHITESPACE = " \n\r\t\f\v";
static std::string ltrim(const std::string& s) static std::string ltrim(const std::string& s)
{ {
size_t start = s.find_first_not_of(WHITESPACE); size_t start = s.find_first_not_of(WHITESPACE);
return (start == std::string::npos) ? "" : s.substr(start); return (start == std::string::npos) ? "" : s.substr(start);
} }
static std::string rtrim(const std::string& s) static std::string rtrim(const std::string& s)
{ {
size_t end = s.find_last_not_of(WHITESPACE); size_t end = s.find_last_not_of(WHITESPACE);
return (end == std::string::npos) ? "" : s.substr(0, end + 1); return (end == std::string::npos) ? "" : s.substr(0, end + 1);
} }
static std::string trim(const std::string& s) static std::string trim(const std::string& s)
{ {
return rtrim(ltrim(s)); return rtrim(ltrim(s));
} }
@ -103,8 +103,8 @@ static std::string get_from_desktop_app_info(const std::string &app_id)
/* Method 2 - use the app_id and check whether there is an icon with this name in the icon theme */ /* Method 2 - use the app_id and check whether there is an icon with this name in the icon theme */
static std::string get_from_icon_theme(const Glib::RefPtr<Gtk::IconTheme>& icon_theme, static std::string get_from_icon_theme(const Glib::RefPtr<Gtk::IconTheme>& icon_theme,
const std::string &app_id) { const std::string &app_id)
{
if (icon_theme->lookup_icon(app_id, 24)) if (icon_theme->lookup_icon(app_id, 24))
return app_id; return app_id;
@ -122,6 +122,10 @@ static bool image_load_icon(Gtk::Image& image, const Glib::RefPtr<Gtk::IconTheme
* send a single app-id, but in any case this works fine */ * send a single app-id, but in any case this works fine */
while (stream >> app_id) while (stream >> app_id)
{ {
size_t start = 0, end = app_id.size();
start = app_id.rfind(".", end);
std::string app_name = app_id.substr(start+1, app_id.size());
auto lower_app_id = app_id; auto lower_app_id = app_id;
std::transform(lower_app_id.begin(), lower_app_id.end(), lower_app_id.begin(), std::transform(lower_app_id.begin(), lower_app_id.end(), lower_app_id.begin(),
[](char c){ return std::tolower(c); }); [](char c){ return std::tolower(c); });
@ -130,10 +134,14 @@ static bool image_load_icon(Gtk::Image& image, const Glib::RefPtr<Gtk::IconTheme
if (icon_name.empty()) if (icon_name.empty())
icon_name = get_from_icon_theme(icon_theme, lower_app_id); icon_name = get_from_icon_theme(icon_theme, lower_app_id);
if (icon_name.empty())
icon_name = get_from_icon_theme(icon_theme, app_name);
if (icon_name.empty()) if (icon_name.empty())
icon_name = get_from_desktop_app_info(app_id); icon_name = get_from_desktop_app_info(app_id);
if (icon_name.empty()) if (icon_name.empty())
icon_name = get_from_desktop_app_info(lower_app_id); icon_name = get_from_desktop_app_info(lower_app_id);
if (icon_name.empty())
icon_name = get_from_desktop_app_info(app_name);
if (icon_name.empty()) if (icon_name.empty())
continue; continue;
@ -489,7 +497,7 @@ void Task::update()
fmt::arg("state", state_string()), fmt::arg("state", state_string()),
fmt::arg("short_state", state_string(true)) fmt::arg("short_state", state_string(true))
); );
if (markup) if (markup)
text_before_.set_markup(txt); text_before_.set_markup(txt);
else else
text_before_.set_label(txt); text_before_.set_label(txt);
@ -502,7 +510,7 @@ void Task::update()
fmt::arg("state", state_string()), fmt::arg("state", state_string()),
fmt::arg("short_state", state_string(true)) fmt::arg("short_state", state_string(true))
); );
if (markup) if (markup)
text_after_.set_markup(txt); text_after_.set_markup(txt);
else else
text_after_.set_label(txt); text_after_.set_label(txt);
@ -516,7 +524,7 @@ void Task::update()
fmt::arg("state", state_string()), fmt::arg("state", state_string()),
fmt::arg("short_state", state_string(true)) fmt::arg("short_state", state_string(true))
); );
if (markup) if (markup)
button_.set_tooltip_markup(txt); button_.set_tooltip_markup(txt);
else else
button_.set_tooltip_text(txt); button_.set_tooltip_text(txt);
@ -584,7 +592,7 @@ static const wl_registry_listener registry_listener_impl = {
.global_remove = handle_global_remove .global_remove = handle_global_remove
}; };
Taskbar::Taskbar(const std::string &id, const waybar::Bar &bar, const Json::Value &config) Taskbar::Taskbar(const std::string &id, const waybar::Bar &bar, const Json::Value &config)
: waybar::AModule(config, "taskbar", id, false, false), : waybar::AModule(config, "taskbar", id, false, false),
bar_(bar), bar_(bar),
box_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0}, box_{bar.vertical ? Gtk::ORIENTATION_VERTICAL : Gtk::ORIENTATION_HORIZONTAL, 0},