From 65dfabc430fdc531b70da505b1481cbc706f5305 Mon Sep 17 00:00:00 2001
From: Cherser-s <29800876+Cherser-s@users.noreply.github.com>
Date: Mon, 21 Aug 2023 22:03:43 +0300
Subject: [PATCH] sni: fix passing relative coordinates to dbus methods

Doesn't correctly handle the case with both margin and width/height being set at the same time.
---
 include/modules/sni/item.hpp | 2 ++
 src/modules/sni/item.cpp     | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/modules/sni/item.hpp b/include/modules/sni/item.hpp
index 423ec7c5..1043157c 100644
--- a/include/modules/sni/item.hpp
+++ b/include/modules/sni/item.hpp
@@ -84,6 +84,8 @@ class Item : public sigc::trackable {
   // visibility of items with Status == Passive
   bool show_passive_ = false;
 
+  const Bar& bar_;
+
   Glib::RefPtr<Gio::DBus::Proxy> proxy_;
   Glib::RefPtr<Gio::Cancellable> cancellable_;
   std::set<std::string_view> update_pending_;
diff --git a/src/modules/sni/item.cpp b/src/modules/sni/item.cpp
index 871621fb..dfaca665 100644
--- a/src/modules/sni/item.cpp
+++ b/src/modules/sni/item.cpp
@@ -39,7 +39,8 @@ Item::Item(const std::string& bn, const std::string& op, const Json::Value& conf
       object_path(op),
       icon_size(16),
       effective_icon_size(0),
-      icon_theme(Gtk::IconTheme::create()) {
+      icon_theme(Gtk::IconTheme::create()),
+      bar_(bar) {
   if (config["icon-size"].isUInt()) {
     icon_size = config["icon-size"].asUInt();
   }
@@ -410,7 +411,8 @@ void Item::makeMenu() {
 
 bool Item::handleClick(GdkEventButton* const& ev) {
   auto parameters = Glib::VariantContainerBase::create_tuple(
-      {Glib::Variant<int>::create(ev->x), Glib::Variant<int>::create(ev->y)});
+      {Glib::Variant<int>::create(ev->x_root + bar_.x_global),
+       Glib::Variant<int>::create(ev->y_root + bar_.y_global)});
   if ((ev->button == 1 && item_is_menu) || ev->button == 3) {
     makeMenu();
     if (gtk_menu != nullptr) {