[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 02/04: Clean up show function slightly.

[noreply at xfce.org]

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 961b2468766e0874614725f8ed0c52eabb9cecfc
Author: Graeme Gott <graeme at gottcode.org>
Date:   Tue Jan 28 13:28:33 2020 -0500

    Clean up show function slightly.
---
 panel-plugin/window.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/window.cpp b/panel-plugin/window.cpp
index f7c2109..b5841de 100644
--- a/panel-plugin/window.cpp
+++ b/panel-plugin/window.cpp
@@ -344,6 +344,9 @@ void WhiskerMenu::Window::show(const Position position)
 	// Make sure recent item count is within max
 	m_recent->enforce_item_count();
 
+	// Make sure recent button is only visible when tracked
+	gtk_widget_set_visible(m_recent_button->get_widget(), wm_settings->recent_items_max);
+
 	// Make sure applications list is current; does nothing unless list has changed
 	if (m_applications->load_applications())
 	{
@@ -357,12 +360,12 @@ void WhiskerMenu::Window::show(const Position position)
 	}
 
 	// Update default page
-	if (wm_settings->display_recent && (m_default_page == m_favorites))
+	if (wm_settings->display_recent)
 	{
 		m_default_button = m_recent_button;
 		m_default_page = m_recent;
 	}
-	else if (!wm_settings->display_recent && (m_default_page == m_recent))
+	else
 	{
 		m_default_button = m_favorites_button;
 		m_default_page = m_favorites;
@@ -656,9 +659,6 @@ void WhiskerMenu::Window::show(const Position position)
 		}
 	}
 
-	// Make sure recent button is only visible when tracked
-	gtk_widget_set_visible(m_recent_button->get_widget(), wm_settings->recent_items_max);
-
 	// Show window
 	gtk_widget_show(GTK_WIDGET(m_window));
 	gtk_window_move(m_window, m_geometry.x, m_geometry.y);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.