This is an automated email from the git hooks/post-receive script.
g o t t c o d e p u s h e d a
c o m m i t t o b r a n c h
m a s t e r
in repository panel-plugins/xfce4-whiskermenu-plugin.
commit 1e2ffd9df9a4d6924863f21a631fd44f5ac35236
Author: Graeme Gott <gra...@gottcode.org>
Date: Fri Jan 17 09:53:50 2020 -0500
Fix regression of row expansion by clicking treeview arrow.
---
panel-plugin/launcher-tree-view.cpp | 26 +-------------------------
panel-plugin/launcher-tree-view.h | 5 +----
2 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/panel-plugin/launcher-tree-view.cpp
b/panel-plugin/launcher-tree-view.cpp
index c3fa2e7..9ec7063 100644
--- a/panel-plugin/launcher-tree-view.cpp
+++ b/panel-plugin/launcher-tree-view.cpp
@@ -39,8 +39,7 @@ static gboolean is_separator(GtkTreeModel* model,
GtkTreeIter* iter, gpointer)
//-----------------------------------------------------------------------------
LauncherTreeView::LauncherTreeView() :
- m_icon_size(0),
- m_row_activated(false)
+ m_icon_size(0)
{
// Create the view
m_view = GTK_TREE_VIEW(gtk_tree_view_new());
@@ -62,10 +61,7 @@ LauncherTreeView::LauncherTreeView() :
g_object_ref_sink(m_view);
// Handle drag-and-drop
- g_signal_connect_slot(m_view, "button-press-event",
&LauncherTreeView::on_button_press_event, this);
g_signal_connect_slot(m_view, "row-activated",
&LauncherTreeView::on_row_activated, this);
- g_signal_connect_slot<GtkTreeView*,GtkTreeIter*,GtkTreePath*>(m_view,
"test-collapse-row", &LauncherTreeView::test_row_toggle, this);
- g_signal_connect_slot<GtkTreeView*,GtkTreeIter*,GtkTreePath*>(m_view,
"test-expand-row", &LauncherTreeView::test_row_toggle, this);
}
//-----------------------------------------------------------------------------
@@ -296,15 +292,6 @@ gboolean
LauncherTreeView::on_key_release_event(GtkWidget*, GdkEvent* event)
//-----------------------------------------------------------------------------
-gboolean LauncherTreeView::on_button_press_event(GtkWidget*, GdkEvent*)
-{
- m_row_activated = false;
-
- return false;
-}
-
-//-----------------------------------------------------------------------------
-
void LauncherTreeView::on_row_activated(GtkTreeView* tree_view, GtkTreePath*
path, GtkTreeViewColumn*)
{
Element* element = NULL;
@@ -316,8 +303,6 @@ void LauncherTreeView::on_row_activated(GtkTreeView*
tree_view, GtkTreePath* pat
return;
}
- m_row_activated = true;
-
if (gtk_tree_view_row_expanded(tree_view, path))
{
gtk_tree_view_collapse_row(tree_view, path);
@@ -329,12 +314,3 @@ void LauncherTreeView::on_row_activated(GtkTreeView*
tree_view, GtkTreePath* pat
}
//-----------------------------------------------------------------------------
-
-gboolean LauncherTreeView::test_row_toggle()
-{
- bool allow = !m_row_activated;
- m_row_activated = false;
- return allow;
-}
-
-//-----------------------------------------------------------------------------
diff --git a/panel-plugin/launcher-tree-view.h
b/panel-plugin/launcher-tree-view.h
index 4c0a30f..3eff48c 100644
--- a/panel-plugin/launcher-tree-view.h
+++ b/panel-plugin/launcher-tree-view.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013, 2016, 2019 Graeme Gott <gra...@gottcode.org>
+ * Copyright (C) 2013, 2016, 2019, 2020 Graeme Gott <gra...@gottcode.org>
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -65,15 +65,12 @@ private:
void create_column();
gboolean on_key_press_event(GtkWidget*, GdkEvent* event);
gboolean on_key_release_event(GtkWidget*, GdkEvent* event);
- gboolean on_button_press_event(GtkWidget*, GdkEvent* event);
void on_row_activated(GtkTreeView* tree_view, GtkTreePath* path,
GtkTreeViewColumn* column);
- gboolean test_row_toggle();
private:
GtkTreeView* m_view;
GtkTreeViewColumn* m_column;
int m_icon_size;
- bool m_row_activated;
};
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
