Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xfce4-whiskermenu-plugin for
openSUSE:Factory checked in at 2021-11-17 01:13:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xfce4-whiskermenu-plugin (Old)
and /work/SRC/openSUSE:Factory/.xfce4-whiskermenu-plugin.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-whiskermenu-plugin"
Wed Nov 17 01:13:42 2021 rev:15 rq:931513 version:2.6.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin.changes
2021-10-18 22:02:53.070123622 +0200
+++
/work/SRC/openSUSE:Factory/.xfce4-whiskermenu-plugin.new.1890/xfce4-whiskermenu-plugin.changes
2021-11-17 01:14:39.722181288 +0100
@@ -1,0 +2,10 @@
+Sun Nov 14 16:24:34 UTC 2021 - Marcel Kuehlhorn <[email protected]>
+
+- Update to version 2.6.2
+ * Fix background shifting when showing menu.
+ (gxo#panel-plugins/xfce4-whiskermenu-plugin#41)
+ * Fix menu not toggling after pressing escape.
+ (gxo#panel-plugins/xfce4-whiskermenu-plugin#65)
+ * Properly prevent interactive search in treeview.
+
+-------------------------------------------------------------------
Old:
----
xfce4-whiskermenu-plugin-2.6.1.tar.bz2
New:
----
xfce4-whiskermenu-plugin-2.6.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-whiskermenu-plugin.spec ++++++
--- /var/tmp/diff_new_pack.rhyoAD/_old 2021-11-17 01:14:40.306181507 +0100
+++ /var/tmp/diff_new_pack.rhyoAD/_new 2021-11-17 01:14:40.310181509 +0100
@@ -19,7 +19,7 @@
%define panel_version 4.12.0
%define plugin whiskermenu
Name: xfce4-whiskermenu-plugin
-Version: 2.6.1
+Version: 2.6.2
Release: 0
Summary: Alternate Xfce Menu
License: GPL-2.0-or-later
++++++ xfce4-whiskermenu-plugin-2.6.1.tar.bz2 ->
xfce4-whiskermenu-plugin-2.6.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-whiskermenu-plugin-2.6.1/CMakeLists.txt
new/xfce4-whiskermenu-plugin-2.6.2/CMakeLists.txt
--- old/xfce4-whiskermenu-plugin-2.6.1/CMakeLists.txt 2021-10-13
22:37:13.000000000 +0200
+++ new/xfce4-whiskermenu-plugin-2.6.2/CMakeLists.txt 2021-11-13
14:57:24.000000000 +0100
@@ -5,7 +5,7 @@
# version number
set(whiskermenu_version_major "2")
set(whiskermenu_version_minor "6")
-set(whiskermenu_version_micro "1")
+set(whiskermenu_version_micro "2")
set(whiskermenu_version_tag "")
set(whiskermenu_version
"${whiskermenu_version_major}.${whiskermenu_version_minor}.${whiskermenu_version_micro}")
if(${whiskermenu_version_tag} MATCHES "git")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-whiskermenu-plugin-2.6.1/NEWS
new/xfce4-whiskermenu-plugin-2.6.2/NEWS
--- old/xfce4-whiskermenu-plugin-2.6.1/NEWS 2021-10-13 22:37:13.000000000
+0200
+++ new/xfce4-whiskermenu-plugin-2.6.2/NEWS 2021-11-13 14:57:24.000000000
+0100
@@ -1,3 +1,9 @@
+2.6.2
+=====
+- Fix background shifting when showing menu. (Issue #41)
+- Fix menu not toggling after pressing escape. (Issue #65)
+- Properly prevent interactive search in treeview.
+
2.6.1
=====
- Fix menu not toggling. (Issue #61)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/command.cpp
new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/command.cpp
--- old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/command.cpp 2021-10-13
22:37:13.000000000 +0200
+++ new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/command.cpp 2021-11-13
14:57:24.000000000 +0100
@@ -18,7 +18,6 @@
#include "command.h"
#include "image-menu-item.h"
-#include "plugin.h"
#include "settings.h"
#include "slot.h"
@@ -213,11 +212,7 @@
}
GError* error = nullptr;
- if (g_spawn_command_line_async(m_command, &error))
- {
- Plugin::launcher_activated();
- }
- else
+ if (!g_spawn_command_line_async(m_command, &error))
{
xfce_dialog_show_error(nullptr, error, m_error_text, nullptr);
g_error_free(error);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/element.cpp
new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/element.cpp
--- old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/element.cpp 2021-10-13
22:37:13.000000000 +0200
+++ new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/element.cpp 2021-11-13
14:57:24.000000000 +0100
@@ -17,8 +17,6 @@
#include "element.h"
-#include "plugin.h"
-
#include <libxfce4ui/libxfce4ui.h>
using namespace WhiskerMenu;
@@ -103,11 +101,7 @@
g_strfreev(argv);
}
- if (result)
- {
- Plugin::launcher_activated();
- }
- else
+ if (!result)
{
xfce_dialog_show_error(nullptr, error, _("Failed to execute
command \"%s\"."), command);
g_error_free(error);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/launcher-tree-view.cpp
new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/launcher-tree-view.cpp
--- old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/launcher-tree-view.cpp
2021-10-13 22:37:13.000000000 +0200
+++ new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/launcher-tree-view.cpp
2021-11-13 14:57:24.000000000 +0100
@@ -188,6 +188,7 @@
{
m_model = model;
gtk_tree_view_set_model(m_view, model);
+ gtk_tree_view_set_search_column(m_view, -1);
}
//-----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/page.cpp
new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/page.cpp
--- old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/page.cpp 2021-10-13
22:37:13.000000000 +0200
+++ new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/page.cpp 2021-11-13
14:57:24.000000000 +0100
@@ -178,7 +178,6 @@
{
m_view = new LauncherTreeView();
g_signal_connect(m_view->get_widget(), "row-activated",
G_CALLBACK(&Page::row_activated_slot), this);
- g_signal_connect_swapped(m_view->get_widget(),
"start-interactive-search", G_CALLBACK(>k_widget_grab_focus),
m_window->get_search_entry());
}
g_signal_connect_slot(m_view->get_widget(), "button-press-event",
&Page::view_button_press_event, this);
g_signal_connect_slot(m_view->get_widget(), "button-release-event",
&Page::view_button_release_event, this);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/plugin.cpp
new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/plugin.cpp
--- old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/plugin.cpp 2021-10-13
22:37:13.000000000 +0200
+++ new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/plugin.cpp 2021-11-13
14:57:24.000000000 +0100
@@ -32,8 +32,6 @@
using namespace WhiskerMenu;
-bool Plugin::m_menu_shown = false;
-
//-----------------------------------------------------------------------------
extern "C" void whiskermenu_construct(XfcePanelPlugin* plugin)
@@ -94,7 +92,8 @@
m_plugin(plugin),
m_window(nullptr),
m_opacity(100),
- m_file_icon(false)
+ m_file_icon(false),
+ m_menu_shown(false)
{
// Load settings
wm_settings = new Settings;
@@ -181,7 +180,6 @@
// Create menu window
m_window = new Window(this);
- g_signal_connect_slot<GtkWidget*>(m_window->get_widget(), "unmap",
&Plugin::menu_hidden, this);
}
//-----------------------------------------------------------------------------
@@ -229,6 +227,18 @@
//-----------------------------------------------------------------------------
+void Plugin::menu_hidden(bool lost_focus)
+{
+ if (!lost_focus)
+ {
+ m_menu_shown = false;
+ }
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_button), false);
+ save();
+}
+
+//-----------------------------------------------------------------------------
+
void Plugin::reload()
{
m_window->hide();
@@ -318,7 +328,6 @@
{
if (gtk_widget_get_visible(m_window->get_widget()))
{
- m_menu_shown = false;
m_window->hide();
}
xfce_panel_plugin_block_autohide(m_plugin, false);
@@ -332,14 +341,6 @@
//-----------------------------------------------------------------------------
-void Plugin::menu_hidden()
-{
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_button), false);
- save();
-}
-
-//-----------------------------------------------------------------------------
-
void Plugin::configure()
{
SettingsDialog* dialog = new SettingsDialog(this);
@@ -567,7 +568,6 @@
{
delete m_window;
m_window = new Window(this);
-
g_signal_connect_slot<GtkWidget*>(m_window->get_widget(), "unmap",
&Plugin::menu_hidden, this);
}
m_opacity = wm_settings->menu_opacity;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/plugin.h
new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/plugin.h
--- old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/plugin.h 2021-10-13
22:37:13.000000000 +0200
+++ new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/plugin.h 2021-11-13
14:57:24.000000000 +0100
@@ -58,6 +58,7 @@
static std::string get_button_title_default();
std::string get_button_icon_name() const;
+ void menu_hidden(bool lost_focus);
void reload();
void set_button_style(ButtonStyle style);
void set_button_title(const std::string& title);
@@ -65,14 +66,8 @@
void set_configure_enabled(bool enabled);
void set_loaded(bool loaded);
- static void launcher_activated()
- {
- m_menu_shown = false;
- }
-
private:
void button_toggled(GtkToggleButton* button);
- void menu_hidden();
void configure();
void icon_changed(const gchar* icon);
void mode_changed(XfcePanelPlugin*, XfcePanelPluginMode mode);
@@ -94,8 +89,7 @@
int m_opacity;
bool m_file_icon;
-
- static bool m_menu_shown;
+ bool m_menu_shown;
};
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/window.cpp
new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/window.cpp
--- old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/window.cpp 2021-10-13
22:37:13.000000000 +0200
+++ new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/window.cpp 2021-11-13
14:57:24.000000000 +0100
@@ -249,7 +249,7 @@
//-----------------------------------------------------------------------------
-void WhiskerMenu::Window::hide()
+void WhiskerMenu::Window::hide(bool lost_focus)
{
// Scroll categories to top
GtkAdjustment* adjustment =
gtk_scrolled_window_get_vadjustment(m_sidebar);
@@ -266,6 +266,9 @@
// Switch back to default page
show_default_page();
+
+ // Inform plugin that window is hidden
+ m_plugin->menu_hidden(lost_focus);
}
//-----------------------------------------------------------------------------
@@ -395,11 +398,11 @@
if (position != PositionVertical)
{
m_geometry.x = layout_left ? parent_x : (parent_x + parent_w -
m_geometry.width);
- m_geometry.y = layout_bottom ? (parent_y - m_geometry.height) :
(parent_y + parent_h);
+ m_geometry.y = layout_bottom ? (parent_y - m_geometry.height -
1) : (parent_y + parent_h + 1);
}
else
{
- m_geometry.x = layout_left ? (parent_x + parent_w) : (parent_x
- m_geometry.width);
+ m_geometry.x = layout_left ? (parent_x + parent_w + 1) :
(parent_x - m_geometry.width - 1);
m_geometry.y = layout_bottom ? (parent_y + parent_h -
m_geometry.height) : parent_y;
}
@@ -571,7 +574,7 @@
if (!m_child_has_focus && gtk_widget_get_visible(widget))
{
- hide();
+ hide(true);
}
return GDK_EVENT_PROPAGATE;
@@ -719,7 +722,7 @@
GdkEventWindowState* state_event =
reinterpret_cast<GdkEventWindowState*>(event);
if (state_event->new_window_state == (GDK_WINDOW_STATE_WITHDRAWN |
GDK_WINDOW_STATE_STICKY))
{
- Plugin::launcher_activated();
+ m_plugin->menu_hidden(false);
}
return GDK_EVENT_PROPAGATE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/window.h
new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/window.h
--- old/xfce4-whiskermenu-plugin-2.6.1/panel-plugin/window.h 2021-10-13
22:37:13.000000000 +0200
+++ new/xfce4-whiskermenu-plugin-2.6.2/panel-plugin/window.h 2021-11-13
14:57:24.000000000 +0100
@@ -78,7 +78,12 @@
return m_recent;
}
- void hide();
+ void hide()
+ {
+ hide(false);
+ }
+
+ void hide(bool lost_focus);
void show(const Position position);
void save();
void set_child_has_focus();
