[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 13/15: Fix commands not following sidebar.
noreply at xfce.org
noreply at xfce.org
Fri Jul 13 13:27:01 CEST 2018
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 a n n o t a t e d t a g v 2 . 2 . 1
in repository panel-plugins/xfce4-whiskermenu-plugin.
commit 61b42a817ce020f056e0822d901cd61861098f66
Author: Graeme Gott <graeme at gottcode.org>
Date: Mon Jul 9 07:30:47 2018 -0400
Fix commands not following sidebar.
---
panel-plugin/window.cpp | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/panel-plugin/window.cpp b/panel-plugin/window.cpp
index f222672..017705a 100644
--- a/panel-plugin/window.cpp
+++ b/panel-plugin/window.cpp
@@ -496,17 +496,31 @@ void WhiskerMenu::Window::show(const Position position)
}
g_object_unref(m_commands_box);
}
+
if ((layout_left && !wm_settings->position_categories_alternate)
|| (!layout_left && wm_settings->position_categories_alternate))
{
gtk_box_reorder_child(m_contents_box, GTK_WIDGET(m_panels_stack), 0);
gtk_box_reorder_child(m_contents_box, GTK_WIDGET(m_sidebar), 1);
+
+ if (m_layout_commands_alternate)
+ {
+ gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_search_entry), 0);
+ gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_commands_box), 1);
+ }
}
else
{
gtk_box_reorder_child(m_contents_box, GTK_WIDGET(m_panels_stack), 1);
gtk_box_reorder_child(m_contents_box, GTK_WIDGET(m_sidebar), 0);
+
+ if (m_layout_commands_alternate)
+ {
+ gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_search_entry), 1);
+ gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_commands_box), 0);
+ }
}
+
if (layout_left != m_layout_left)
{
m_layout_left = layout_left;
@@ -523,9 +537,6 @@ void WhiskerMenu::Window::show(const Position position)
gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_profilepic->get_widget()), 0);
gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_username), 1);
gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_resizer->get_widget()), 2);
-
- gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_search_entry), 0);
- gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_commands_box), 1);
}
else if (m_layout_commands_alternate)
{
@@ -540,9 +551,6 @@ void WhiskerMenu::Window::show(const Position position)
gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_profilepic->get_widget()), 2);
gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_username), 1);
gtk_box_reorder_child(m_title_box, GTK_WIDGET(m_resizer->get_widget()), 0);
-
- gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_search_entry), 1);
- gtk_box_reorder_child(m_search_box, GTK_WIDGET(m_commands_box), 0);
}
else if (m_layout_left)
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list