[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 04/06: Clean up setting view mode in configuration dialog.

[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 2dc609dabf0c0632873ad7c5112d53530115c5d0
Author: Graeme Gott <graeme at gottcode.org>
Date:   Thu Jan 30 15:14:37 2020 -0500

    Clean up setting view mode in configuration dialog.
---
 panel-plugin/configuration-dialog.cpp | 36 ++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/panel-plugin/configuration-dialog.cpp b/panel-plugin/configuration-dialog.cpp
index 02b1ec2..c4e8f55 100644
--- a/panel-plugin/configuration-dialog.cpp
+++ b/panel-plugin/configuration-dialog.cpp
@@ -149,35 +149,45 @@ ConfigurationDialog::~ConfigurationDialog()
 
 void ConfigurationDialog::toggle_show_as_icons(GtkToggleButton *button)
 {
-	const bool active = gtk_toggle_button_get_active(button);
-	wm_settings->view_as_icons = active;
-	wm_settings->set_modified();
-	m_plugin->reload();
+	if (gtk_toggle_button_get_active(button))
+	{
+		wm_settings->view_as_icons = true;
+		wm_settings->load_hierarchy = false;
+		wm_settings->set_modified();
+		m_plugin->reload();
 
-	gtk_widget_set_sensitive(GTK_WIDGET(m_show_descriptions), !active);
+		gtk_widget_set_sensitive(GTK_WIDGET(m_show_descriptions), false);
+	}
 }
 
 //-----------------------------------------------------------------------------
 
 void ConfigurationDialog::toggle_show_as_list(GtkToggleButton *button)
 {
-	wm_settings->view_as_icons = !gtk_toggle_button_get_active(button);
-	wm_settings->set_modified();
-	m_plugin->reload();
+	if (gtk_toggle_button_get_active(button))
+	{
+		wm_settings->view_as_icons = false;
+		wm_settings->load_hierarchy = false;
+		wm_settings->set_modified();
+		m_plugin->reload();
+
+		gtk_widget_set_sensitive(GTK_WIDGET(m_show_descriptions), true);
+	}
 }
 
 //-----------------------------------------------------------------------------
 
 void ConfigurationDialog::toggle_show_as_tree(GtkToggleButton* button)
 {
-	const bool active = gtk_toggle_button_get_active(button);
-	wm_settings->load_hierarchy = active;
-	if (active)
+	if (gtk_toggle_button_get_active(button))
 	{
 		wm_settings->view_as_icons = false;
+		wm_settings->load_hierarchy = true;
+		wm_settings->set_modified();
+		m_plugin->reload();
+
+		gtk_widget_set_sensitive(GTK_WIDGET(m_show_descriptions), true);
 	}
-	wm_settings->set_modified();
-	m_plugin->reload();
 }
 
 //-----------------------------------------------------------------------------

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