Merge branch 'master' into swaybar-ipc

This commit is contained in:
Alex
2021-12-01 11:48:03 +01:00
committed by GitHub
7 changed files with 95 additions and 26 deletions

View File

@ -98,7 +98,7 @@ class Bar {
private:
void onMap(GdkEventAny *);
auto setupWidgets() -> void;
void getModules(const Factory &, const std::string &);
void getModules(const Factory &, const std::string &, Gtk::Box*);
void setupAltFormatKeyForModule(const std::string &module_name);
void setupAltFormatKeyForModuleList(const char *module_list_name);
void setMode(const bar_mode &);
@ -119,6 +119,7 @@ class Bar {
using BarIpcClient = modules::sway::BarIpcClient;
std::unique_ptr<BarIpcClient> _ipc_client;
#endif
std::vector<std::unique_ptr<waybar::AModule>> modules_all_;
};
} // namespace waybar