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

Merge pull request #1785 from ElJeffe/hyprland_monitor_remove

This commit is contained in:
Alex 2022-11-10 09:21:52 +01:00 committed by GitHub
parent 781da93f3d 9f0a14c22b
commit 3718902b9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/backlight.cpp
View File

@ -73,7 +73,8 @@ void check_nn(const void *ptr, const char *message = "ptr was null") {
}
} // namespace
waybar::modules::Backlight::BacklightDev::BacklightDev(std::string name, int actual, int max, bool powered)
waybar::modules::Backlight::BacklightDev::BacklightDev(std::string name, int actual, int max,
bool powered)
: name_(std::move(name)), actual_(actual), max_(max), powered_(powered) {}
std::string_view waybar::modules::Backlight::BacklightDev::name() const { return name_; }

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

@ -112,13 +112,13 @@ void IPC::registerForIPC(const std::string& ev, EventHandler* ev_handler) {
}
void IPC::unregisterForIPC(EventHandler* ev_handler) {
if (!ev_handler) {
if (!ev_handler) {
return;
}
callbackMutex.lock();
for(auto it = callbacks.begin(); it != callbacks.end(); ) {
for (auto it = callbacks.begin(); it != callbacks.end();) {
auto it_current = it;
it++;
auto& [eventname, handler] = *it_current;

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

@ -56,7 +56,7 @@ uint Window::getActiveWorkspaceID(std::string monitorName) {
assert(json.isArray());
auto monitor = std::find_if(json.begin(), json.end(),
[&](Json::Value monitor) { return monitor["name"] == monitorName; });
if(monitor == std::end(json)) {
if (monitor == std::end(json)) {
return 0;
}
return (*monitor)["activeWorkspace"]["id"].as<uint>();