[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 04/04: Always allow positioning commands next to search.

[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 b10cd23c17d02e4cdde85bcb3d6f653a0465b5c5
Author: Graeme Gott <graeme at gottcode.org>
Date:   Mon Jul 9 10:35:26 2018 -0400

    Always allow positioning commands next to search.
---
 panel-plugin/configuration-dialog.cpp | 7 -------
 panel-plugin/settings.cpp             | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/panel-plugin/configuration-dialog.cpp b/panel-plugin/configuration-dialog.cpp
index 2e0653b..0d2d82a 100644
--- a/panel-plugin/configuration-dialog.cpp
+++ b/panel-plugin/configuration-dialog.cpp
@@ -238,14 +238,8 @@ void ConfigurationDialog::toggle_show_hierarchy(GtkToggleButton* button)
 
 void ConfigurationDialog::toggle_position_search_alternate(GtkToggleButton* button)
 {
-	bool active = gtk_toggle_button_get_active(button);
 	wm_settings->position_search_alternate = gtk_toggle_button_get_active(button);
 	wm_settings->set_modified();
-	gtk_widget_set_sensitive(GTK_WIDGET(m_position_commands_alternate), active);
-	if (!active)
-	{
-		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_position_commands_alternate), false);
-	}
 }
 
 //-----------------------------------------------------------------------------
@@ -709,7 +703,6 @@ GtkWidget* ConfigurationDialog::init_behavior_tab()
 	m_position_commands_alternate = gtk_check_button_new_with_mnemonic(_("Position commands next to search _entry"));
 	gtk_box_pack_start(behavior_vbox, m_position_commands_alternate, true, true, 0);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(m_position_commands_alternate), wm_settings->position_commands_alternate);
-	gtk_widget_set_sensitive(GTK_WIDGET(m_position_commands_alternate), wm_settings->position_search_alternate);
 	g_signal_connect_slot(m_position_commands_alternate, "toggled", &ConfigurationDialog::toggle_position_commands_alternate, this);
 
 	// Add option to use alternate categories position
diff --git a/panel-plugin/settings.cpp b/panel-plugin/settings.cpp
index 7b0775c..0b17b64 100644
--- a/panel-plugin/settings.cpp
+++ b/panel-plugin/settings.cpp
@@ -190,7 +190,7 @@ void Settings::load(char* file)
 	display_recent = xfce_rc_read_bool_entry(rc, "display-recent-default", display_recent) && recent_items_max;
 
 	position_search_alternate = xfce_rc_read_bool_entry(rc, "position-search-alternate", position_search_alternate);
-	position_commands_alternate = xfce_rc_read_bool_entry(rc, "position-commands-alternate", position_commands_alternate) && position_search_alternate;
+	position_commands_alternate = xfce_rc_read_bool_entry(rc, "position-commands-alternate", position_commands_alternate);
 	position_categories_alternate = xfce_rc_read_bool_entry(rc, "position-categories-alternate", position_categories_alternate);
 	stay_on_focus_out = xfce_rc_read_bool_entry(rc, "stay-on-focus-out", stay_on_focus_out);
 

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