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

Merge pull request #2025 from ElyesH/master

pull/2019/head
Alex 2023-02-25 10:49:59 +01:00 committed by GitHub
parent ea38eec2af 1af25094b7
commit 09142fa322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/gamemode.cpp
View File

@ -55,7 +55,7 @@ Gamemode::Gamemode(const std::string& id, const Json::Value& config)
} }
box_.set_spacing(iconSpacing); box_.set_spacing(iconSpacing);
// Wether to use icon or not // Whether to use icon or not
if (config_["use-icon"].isBool()) { if (config_["use-icon"].isBool()) {
useIcon = config_["use-icon"].asBool(); useIcon = config_["use-icon"].asBool();
} }

2
src/modules/network.cpp
View File

@ -98,7 +98,7 @@ waybar::modules::Network::Network(const std::string &id, const Json::Value &conf
// Start with some "text" in the module's label_. update() will then // Start with some "text" in the module's label_. update() will then
// update it. Since the text should be different, update() will be able // update it. Since the text should be different, update() will be able
// to show or hide the event_box_. This is to work around the case where // to show or hide the event_box_. This is to work around the case where
// the module start with no text, but the the event_box_ is shown. // the module start with no text, but the event_box_ is shown.
label_.set_markup("<s></s>"); label_.set_markup("<s></s>");
auto bandwidth = readBandwidthUsage(); auto bandwidth = readBandwidthUsage();

2
src/modules/sway/workspaces.cpp
View File

@ -156,7 +156,7 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
if (l == r || config_["alphabetical_sort"].asBool()) { if (l == r || config_["alphabetical_sort"].asBool()) {
// In case both integers are the same, lexicographical // In case both integers are the same, lexicographical
// sort. The code above already ensure that this will only // sort. The code above already ensure that this will only
// happend in case of explicitly numbered workspaces. // happened in case of explicitly numbered workspaces.
// //
// Additionally, if the config specifies to sort workspaces // Additionally, if the config specifies to sort workspaces
// alphabetically do this here. // alphabetically do this here.

2
src/util/sanitize_str.cpp
View File

@ -6,7 +6,7 @@
namespace waybar::util { namespace waybar::util {
// replaces ``<>&"'`` with their encoded counterparts // replaces ``<>&"'`` with their encoded counterparts
std::string sanitize_string(std::string str) { std::string sanitize_string(std::string str) {
// note: it's important that '&' is replaced first; therefor we *can't* use std::map // note: it's important that '&' is replaced first; therefore we *can't* use std::map
const std::pair<char, std::string> replacement_table[] = { const std::pair<char, std::string> replacement_table[] = {
{'&', "&amp;"}, {'<', "&lt;"}, {'>', "&gt;"}, {'"', "&quot;"}, {'\'', "&apos;"}}; {'&', "&amp;"}, {'<', "&lt;"}, {'>', "&gt;"}, {'"', "&quot;"}, {'\'', "&apos;"}};
size_t startpoint; size_t startpoint;