Skip to content

Commit 9646efe

Browse files
AlexaysLukashonakV
authored andcommitted
Merge pull request Alexays#3646 from LukashonakV/cava_bump
Signed-off-by: Viktar Lukashonak <myxabeer@gmail.com>
1 parent d9294f2 commit 9646efe

File tree

3 files changed

+14
-11
lines changed

3 files changed

+14
-11
lines changed

src/factory.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
#include "modules/custom.hpp"
114114
#include "modules/image.hpp"
115115
#include "modules/temperature.hpp"
116-
#include "modules/user.hpp"
117116
#include "modules/ui.hpp"
117+
#include "modules/user.hpp"
118118

119119
waybar::Factory::Factory(const Bar& bar, const Json::Value& config) : bar_(bar), config_(config) {}
120120

src/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ int main(int argc, char* argv[]) {
109109

110110
std::signal(SIGUSR1, SIG_IGN);
111111
std::signal(SIGUSR2, SIG_IGN);
112-
std::signal(SIGINT, SIG_IGN);
112+
std::signal(SIGINT, SIG_IGN);
113113

114114
delete client;
115115
return ret;

src/modules/ui.cpp

+12-9
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
waybar::modules::UI::UI(const std::string& name, const std::string& id, const Json::Value& config)
99
: AModule(config, "ui-" + name, id, false, false) {
1010
if (config_["file-path"].isString()) {
11-
Glib::RefPtr<Gtk::Builder> builder{Gtk::Builder::create_from_file(config_["file-path"].asString())};
12-
Glib::RefPtr<Gtk::Widget> uiWg{Glib::RefPtr<Gtk::Widget>::cast_dynamic(builder->get_object(name_))};
11+
Glib::RefPtr<Gtk::Builder> builder{
12+
Gtk::Builder::create_from_file(config_["file-path"].asString())};
13+
Glib::RefPtr<Gtk::Widget> uiWg{
14+
Glib::RefPtr<Gtk::Widget>::cast_dynamic(builder->get_object(name_))};
1315

1416
if (uiWg) {
1517
uiWg->set_name(name_);
@@ -19,17 +21,18 @@ waybar::modules::UI::UI(const std::string& name, const std::string& id, const Js
1921
uiWg->get_style_context()->add_class(MODULE_CLASS);
2022

2123
Glib::RefPtr<Gio::SimpleActionGroup> actionGroup{Gio::SimpleActionGroup::create()};
22-
Glib::RefPtr<Gio::SimpleAction> action{actionGroup->add_action_with_parameter("doAction",
23-
Glib::VARIANT_TYPE_STRING,
24-
[this](const Glib::VariantBase &param) {
25-
assert(param.is_of_type(Glib::VARIANT_TYPE_STRING));
26-
waybar::util::command::res res = waybar::util::command::exec(Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(param).get(),"TLP"); })};
24+
Glib::RefPtr<Gio::SimpleAction> action{actionGroup->add_action_with_parameter(
25+
"doAction", Glib::VARIANT_TYPE_STRING, [this](const Glib::VariantBase &param) {
26+
assert(param.is_of_type(Glib::VARIANT_TYPE_STRING));
27+
waybar::util::command::res res = waybar::util::command::exec(
28+
Glib::VariantBase::cast_dynamic<Glib::Variant<Glib::ustring>>(param).get(),"TLP");
29+
})};
2730

2831
uiWg->insert_action_group(name_, actionGroup);
2932
event_box_.add(*uiWg.get());
3033
} else {
31-
spdlog::error("UI: object id \"{}\" is not found at \"{}\"",
32-
name_, config_["file-path"].asString());
34+
spdlog::error("UI: object id \"{}\" is not found at \"{}\"", name_,
35+
config_["file-path"].asString());
3336
}
3437
}
3538
}

0 commit comments

Comments
 (0)