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

refactor: remove useless bar param

pull/285/head
Alex 2019-05-07 13:21:18 +02:00
parent 77d9dd06af
commit b75e0bb0d0
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/modules/sway/mode.hpp
View File

@ -11,7 +11,7 @@ namespace waybar::modules::sway {
class Mode : public ALabel { class Mode : public ALabel {
public: public:
Mode(const std::string&, const waybar::Bar&, const Json::Value&); Mode(const std::string&, const Json::Value&);
~Mode() = default; ~Mode() = default;
auto update() -> void; auto update() -> void;
@ -19,7 +19,6 @@ class Mode : public ALabel {
void onEvent(const struct Ipc::ipc_response&); void onEvent(const struct Ipc::ipc_response&);
void worker(); void worker();
const Bar& bar_;
waybar::util::SleeperThread thread_; waybar::util::SleeperThread thread_;
Ipc ipc_; Ipc ipc_;
std::string mode_; std::string mode_;

2
src/factory.cpp
View File

@ -12,7 +12,7 @@ waybar::IModule* waybar::Factory::makeModule(const std::string& name) const {
} }
#ifdef HAVE_SWAY #ifdef HAVE_SWAY
if (ref == "sway/mode") { if (ref == "sway/mode") {
return new waybar::modules::sway::Mode(id, bar_, config_[name]); return new waybar::modules::sway::Mode(id, config_[name]);
} }
if (ref == "sway/workspaces") { if (ref == "sway/workspaces") {
return new waybar::modules::sway::Workspaces(id, bar_, config_[name]); return new waybar::modules::sway::Workspaces(id, bar_, config_[name]);

4
src/modules/sway/mode.cpp
View File

@ -2,8 +2,8 @@
namespace waybar::modules::sway { namespace waybar::modules::sway {
Mode::Mode(const std::string& id, const Bar& bar, const Json::Value& config) Mode::Mode(const std::string& id, const Json::Value& config)
: ALabel(config, "{}"), bar_(bar) { : ALabel(config, "{}") {
label_.set_name("mode"); label_.set_name("mode");
if (!id.empty()) { if (!id.empty()) {
label_.get_style_context()->add_class(id); label_.get_style_context()->add_class(id);