[Pkg-xfce-commits] [Git][xfce-team/goodies/xfce4-whiskermenu-plugin][upstream/latest] New upstream version 2.9.2

[Yves-Alexis Perez (@corsac)]

Yves-Alexis Perez pushed to branch upstream/latest at xfce / goodies / xfce4-whiskermenu-plugin


Commits:
f803bc3f by Yves-Alexis Perez at 2025-02-21T14:27:23+01:00
New upstream version 2.9.2
- - - - -


4 changed files:

- CMakeLists.txt
- NEWS
- panel-plugin/plugin.cpp
- panel-plugin/window.cpp


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -4,7 +4,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(whiskermenu VERSION 2.9.1)
+project(whiskermenu VERSION 2.9.2)
 
 # options
 string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_TOLOWER)


=====================================
NEWS
=====================================
@@ -1,3 +1,7 @@
+2.9.2
+=====
+- Fix menu not shown on correct monitor. (Issue #154)
+
 2.9.1
 =====
 - Fix menu position in Wayland with multiple monitors. (Issue #153)


=====================================
panel-plugin/plugin.cpp
=====================================
@@ -230,7 +230,7 @@ std::string Plugin::get_button_title_default()
 
 void Plugin::get_menu_position(int* x, int* y) const
 {
-	xfce_panel_plugin_position_widget(m_plugin, m_window->get_widget(), get_button(), x, y);
+	xfce_panel_plugin_position_widget(m_plugin, m_window->get_widget(), m_button, x, y);
 }
 
 //-----------------------------------------------------------------------------


=====================================
panel-plugin/window.cpp
=====================================
@@ -524,6 +524,7 @@ void WhiskerMenu::Window::show(const Position position)
 	m_recent->get_view()->reload_icon_size();
 	m_applications->get_view()->reload_icon_size();
 
+	GdkMonitor* monitor_gdk = nullptr;
 	if (position == PositionAtButton)
 	{
 		// Wait up to half a second for auto-hidden panels to be shown
@@ -543,6 +544,7 @@ void WhiskerMenu::Window::show(const Position position)
 
 		// Fetch position
 		m_plugin->get_menu_position(&m_geometry.x, &m_geometry.y);
+		monitor_gdk = gdk_display_get_monitor_at_window(gtk_widget_get_display(parent), gtk_widget_get_window(parent));
 	}
 	else
 	{
@@ -551,10 +553,10 @@ void WhiskerMenu::Window::show(const Position position)
 		GdkSeat* seat = gdk_display_get_default_seat(display);
 		GdkDevice* device = gdk_seat_get_pointer(seat);
 		gdk_device_get_position(device, nullptr, &m_geometry.x, &m_geometry.y);
+		monitor_gdk = gdk_display_get_monitor_at_point(display, m_geometry.x, m_geometry.y);
 	}
 
 	// Resize window if necessary, and also prevent it from being larger than screen
-	GdkMonitor* monitor_gdk = gdk_display_get_monitor_at_point(gdk_display_get_default(), m_geometry.x, m_geometry.y);
 #ifdef HAVE_GTK_LAYER_SHELL
 	if (gtk_layer_is_supported())
 	{



View it on GitLab: https://salsa.debian.org/xfce-team/goodies/xfce4-whiskermenu-plugin/-/commit/f803bc3fb56ca584f3da74fe0b57e454798284cb

-- 
View it on GitLab: https://salsa.debian.org/xfce-team/goodies/xfce4-whiskermenu-plugin/-/commit/f803bc3fb56ca584f3da74fe0b57e454798284cb
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-xfce-commits/attachments/20250221/29a57960/attachment-0001.htm>