Merge pull request #3500 from khaneliman/group

Alexays · Aug 3, 2024 · 2131678 · 2131678
2 parents 003dd3a + 17f07b2
commit 2131678
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/include/group.hpp b/include/group.hpp
@@ -12,7 +12,7 @@ namespace waybar {
 class Group : public AModule {
  public:
   Group(const std::string &, const std::string &, const Json::Value &, bool);
-  virtual ~Group() = default;
+  ~Group() override = default;
   auto update() -> void override;
   operator Gtk::Widget &() override;
 

diff --git a/src/group.cpp b/src/group.cpp
@@ -9,7 +9,7 @@
 
 namespace waybar {
 
-const Gtk::RevealerTransitionType getPreferredTransitionType(bool is_vertical) {
+Gtk::RevealerTransitionType getPreferredTransitionType(bool is_vertical) {
   /* The transition direction of a drawer is not actually determined by the transition type,
    * but rather by the order of 'box' and 'revealer_box':
    *   'REVEALER_TRANSITION_TYPE_SLIDE_LEFT' and 'REVEALER_TRANSITION_TYPE_SLIDE_RIGHT'
@@ -102,7 +102,7 @@ bool Group::handleMouseEnter(GdkEventCrossing* const& e) {
 }
 
 bool Group::handleMouseLeave(GdkEventCrossing* const& e) {
-  if (!click_to_reveal) {
+  if (!click_to_reveal && e->detail != GDK_NOTIFY_INFERIOR) {
     hide_group();
   }
   return false;
@@ -112,7 +112,7 @@ bool Group::handleToggle(GdkEventButton* const& e) {
   if (!click_to_reveal || e->button != 1) {
     return false;
   }
-  if (box.get_state_flags() & Gtk::StateFlags::STATE_FLAG_PRELIGHT) {
+  if ((box.get_state_flags() & Gtk::StateFlags::STATE_FLAG_PRELIGHT) != 0U) {
     hide_group();
   } else {
     show_group();

diff --git a/src/util/css_reload_helper.cpp b/src/util/css_reload_helper.cpp
@@ -44,7 +44,7 @@ std::string waybar::CssReloadHelper::findPath(const std::string& filename) {
 
   // File monitor does not work with symlinks, so resolve them
   std::string original = result;
-  while(std::filesystem::is_symlink(result)) {
+  while (std::filesystem::is_symlink(result)) {
     result = std::filesystem::read_symlink(result);
 
     // prevent infinite cycle