Merge remote-tracking branch 'origin/master' into pr-4014
# Conflicts: # include/group.hpp # src/group.cpp
This commit is contained in:
+11
-6
@@ -10,13 +10,15 @@
|
||||
namespace waybar {
|
||||
|
||||
class Group : public AModule {
|
||||
sigc::connection reveal_timeout_;
|
||||
|
||||
public:
|
||||
Group(const std::string &, const std::string &, const Json::Value &, bool);
|
||||
Group(const std::string&, const std::string&, const Json::Value&, bool);
|
||||
~Group() override = default;
|
||||
auto update() -> void override;
|
||||
operator Gtk::Widget &() override;
|
||||
operator Gtk::Widget&() override;
|
||||
|
||||
virtual Gtk::Box &getBox();
|
||||
virtual Gtk::Box& getBox();
|
||||
void addWidget(AModule* module);
|
||||
|
||||
protected:
|
||||
@@ -27,10 +29,13 @@ class Group : public AModule {
|
||||
bool is_drawer = false;
|
||||
bool click_to_reveal = false;
|
||||
std::string always_visible_class;
|
||||
bool empty_if_drawer_empty = false;
|
||||
int reveal_delay = 0;
|
||||
std::string add_class_to_drawer_children;
|
||||
bool handleMouseEnter(GdkEventCrossing *const &ev) override;
|
||||
bool handleMouseLeave(GdkEventCrossing *const &ev) override;
|
||||
bool handleToggle(GdkEventButton *const &ev) override;
|
||||
bool handleMouseEnter(GdkEventCrossing* const& ev) override;
|
||||
bool handleMouseLeave(GdkEventCrossing* const& ev) override;
|
||||
bool handleToggle(GdkEventButton* const& ev) override;
|
||||
bool handleScroll(GdkEventScroll* e) override;
|
||||
void show_group();
|
||||
void hide_group();
|
||||
void manage_visibility(AModule* module);
|
||||
|
||||
Reference in New Issue
Block a user