← Back to branch summary

~brandontschaefer/unity/bump-to-new-nux-abi

« back to all changes in this revision

Viewing changes to decorations/DecorationsManager.cpp

  • Committer: Marco Trevisan (Treviño)
  • Date: 2014-12-19 13:03:44 UTC
  • mto: (3899.2.1 lim-everywhere)
  • mto: This revision was merged to the branch mainline in revision 3907.
  • Revision ID: mail@3v1n0.net-20141219130344-z716q8eh6s98pez9
MenuManager: move integrated_menus property here, from decoration::Style

This is not related to decoration or stiling at all, so it's better to keep it there

Show diffs side-by-side

added added

removed removed

Lines of Context:
decorations/DecorationsManager.cpp
58
58
  manager_->inactive_shadow_color.changed.connect(sigc::hide(sigc::bind(rebuild_cb, false)));
59
59
  manager_->inactive_shadow_radius.changed.connect(sigc::hide(sigc::bind(rebuild_cb, false)));
60
60
  manager_->shadow_offset.changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::UpdateWindowsExtents)));
61
 
  Style::Get()->integrated_menus.changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::SetupIntegratedMenus)));
 
61
  menu_manager_->integrated_menus.changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::SetupIntegratedMenus)));
62
62
 
63
63
  BuildInactiveShadowTexture();
64
64
  BuildActiveShadowTexture();
110
110
 
111
111
void Manager::Impl::SetupIntegratedMenus()
112
112
{
113
 
  if (!Style::Get()->integrated_menus())
 
113
  if (!menu_manager_->integrated_menus())
114
114
  {
115
115
    UnsetAppMenu();
116
116
    menu_connections_.Clear();