This is an automated email from the git hooks/post-receive script.
gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.
commit dd4bf3e50be37e9521b6ffb47361aada95bd8d6c
Author: Graeme Gott <gra...@gottcode.org>
Date: Fri Aug 12 05:26:09 2016 -0400
Rename sidebar buttons box.
---
panel-plugin/window.cpp | 18 +++++++++---------
panel-plugin/window.h | 2 +-
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/panel-plugin/window.cpp b/panel-plugin/window.cpp
index 3188678..dbd9c93 100644
--- a/panel-plugin/window.cpp
+++ b/panel-plugin/window.cpp
@@ -182,10 +182,10 @@ WhiskerMenu::Window::Window() :
gtk_box_pack_start(m_panels_box, m_applications->get_widget(), true,
true, 0);
// Create box for packing sidebar
- m_sidebar_box = GTK_BOX(gtk_vbox_new(false, 0));
- gtk_box_pack_start(m_sidebar_box,
GTK_WIDGET(m_favorites_button->get_button()), false, false, 0);
- gtk_box_pack_start(m_sidebar_box,
GTK_WIDGET(m_recent_button->get_button()), false, false, 0);
- gtk_box_pack_start(m_sidebar_box, gtk_hseparator_new(), false, true, 0);
+ m_sidebar_buttons = GTK_BOX(gtk_vbox_new(false, 0));
+ gtk_box_pack_start(m_sidebar_buttons,
GTK_WIDGET(m_favorites_button->get_button()), false, false, 0);
+ gtk_box_pack_start(m_sidebar_buttons,
GTK_WIDGET(m_recent_button->get_button()), false, false, 0);
+ gtk_box_pack_start(m_sidebar_buttons, gtk_hseparator_new(), false,
true, 0);
m_sidebar = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(NULL, NULL));
gtk_box_pack_start(m_contents_box, GTK_WIDGET(m_sidebar), false, false,
0);
@@ -196,7 +196,7 @@ WhiskerMenu::Window::Window() :
gtk_scrolled_window_get_vadjustment(m_sidebar));
gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_NONE);
gtk_container_add(GTK_CONTAINER(m_sidebar), viewport);
- gtk_container_add(GTK_CONTAINER(viewport), GTK_WIDGET(m_sidebar_box));
+ gtk_container_add(GTK_CONTAINER(viewport),
GTK_WIDGET(m_sidebar_buttons));
GtkSizeGroup* sidebar_size_group =
gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
gtk_size_group_add_widget(sidebar_size_group, GTK_WIDGET(m_sidebar));
@@ -215,8 +215,8 @@ WhiskerMenu::Window::Window() :
gtk_window_set_default_size(m_window, m_geometry.width,
m_geometry.height);
// Handle transparency
- gtk_widget_set_app_paintable(GTK_WIDGET(m_sidebar_box), true);
- g_signal_connect_slot(m_sidebar_box, "expose-event",
&Window::on_expose_event, this);
+ gtk_widget_set_app_paintable(GTK_WIDGET(m_sidebar_buttons), true);
+ g_signal_connect_slot(m_sidebar_buttons, "expose-event",
&Window::on_expose_event, this);
gtk_widget_set_app_paintable(GTK_WIDGET(m_window), true);
g_signal_connect_slot(m_window, "expose-event",
&Window::on_expose_event, this);
g_signal_connect_slot(m_window, "screen-changed",
&Window::on_screen_changed_event, this);
@@ -605,10 +605,10 @@ void WhiskerMenu::Window::set_categories(const
std::vector<SectionButton*>& cate
for (std::vector<SectionButton*>::const_iterator i =
categories.begin(), end = categories.end(); i != end; ++i)
{
(*i)->set_group(m_recent_button->get_group());
- gtk_box_pack_start(m_sidebar_box,
GTK_WIDGET((*i)->get_button()), false, false, 0);
+ gtk_box_pack_start(m_sidebar_buttons,
GTK_WIDGET((*i)->get_button()), false, false, 0);
g_signal_connect_slot<GtkToggleButton*>((*i)->get_button(),
"toggled", &Window::category_toggled, this);
}
- gtk_widget_show_all(GTK_WIDGET(m_sidebar_box));
+ gtk_widget_show_all(GTK_WIDGET(m_sidebar_buttons));
show_default_page();
}
diff --git a/panel-plugin/window.h b/panel-plugin/window.h
index 46e4793..e8f3e3c 100644
--- a/panel-plugin/window.h
+++ b/panel-plugin/window.h
@@ -99,7 +99,6 @@ private:
GtkBox* m_search_box;
GtkBox* m_contents_box;
GtkBox* m_panels_box;
- GtkBox* m_sidebar_box;
ProfilePicture* m_profilepic;
GtkLabel* m_username;
@@ -118,6 +117,7 @@ private:
Page* m_default_page;
GtkScrolledWindow* m_sidebar;
+ GtkBox* m_sidebar_buttons;
SectionButton* m_favorites_button;
SectionButton* m_recent_button;
SectionButton* m_default_button;
--
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
