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 (bzr r3884.9.15)

5 files changed, 10 insertions, 9 deletions

diff --git a/unity-shared/DecorationStyle.cpp b/unity-shared/DecorationStyle.cpp
index 1334d2d8f..e6c529e42 100644
--- a/unity-shared/DecorationStyle.cpp
+++ b/unity-shared/DecorationStyle.cpp
@@ -157,7 +157,6 @@ struct Style::Impl
 gtk_widget_path_append_type(widget_path.get(), unity_decoration_get_type());
 gtk_style_context_set_path(ctx_, widget_path.get());
 
- parent_->integrated_menus = false;
 parent_->theme = glib::String(GetSettingValue<gchar*>("gtk-theme-name")).Str();
 parent_->font = glib::String(GetSettingValue<gchar*>("gtk-font-name")).Str();
 parent_->font_scale = 1.0;
diff --git a/unity-shared/DecorationStyle.h b/unity-shared/DecorationStyle.h
index d15cd0f01..47a688587 100644
--- a/unity-shared/DecorationStyle.h
+++ b/unity-shared/DecorationStyle.h
@@ -118,7 +118,6 @@ public:
 nux::Property<std::string> theme;
 nux::Property<std::string> font;
 nux::Property<std::string> title_font;
- nux::Property<bool> integrated_menus;
 nux::Property<unsigned> grab_wait;
 nux::Property<double> font_scale;
 
diff --git a/unity-shared/MenuManager.cpp b/unity-shared/MenuManager.cpp
index 2f78b62f7..7a9341e75 100644
--- a/unity-shared/MenuManager.cpp
+++ b/unity-shared/MenuManager.cpp
@@ -36,6 +36,7 @@ namespace
 DECLARE_LOGGER(logger, "unity.menu.manager");
 
 const std::string SETTINGS_NAME = "com.canonical.Unity";
+const std::string LIM_KEY = "integrated-menus";
 const std::string ALWAYS_SHOW_MENUS_KEY = "always-show-menus";
 }
 
@@ -58,7 +59,12 @@ struct Manager::Impl : sigc::trackable
 indicators_->on_entry_activate_request.connect(sigc::mem_fun(this, &Impl::ActivateRequest));
 indicators_->icon_paths_changed.connect(sigc::mem_fun(this, &Impl::IconPathsChanged));
 
+ parent_->integrated_menus = g_settings_get_boolean(settings_, LIM_KEY.c_str());
 parent_->always_show_menus = g_settings_get_boolean(settings_, ALWAYS_SHOW_MENUS_KEY.c_str());
+
+ signals_.Add<void, GSettings*, const gchar*>(settings_, "changed::" + LIM_KEY, [this] (GSettings*, const gchar*) {
+ parent_->integrated_menus = g_settings_get_boolean(settings_, LIM_KEY.c_str());
+ });
 signals_.Add<void, GSettings*, const gchar*>(settings_, "changed::" + ALWAYS_SHOW_MENUS_KEY, [this] (GSettings*, const gchar*) {
 parent_->always_show_menus = g_settings_get_boolean(settings_, ALWAYS_SHOW_MENUS_KEY.c_str());
 });
@@ -171,7 +177,8 @@ struct Manager::Impl : sigc::trackable
 };
 
 Manager::Manager(Indicators::Ptr const& indicators, key::Grabber::Ptr const& grabber)
- : show_menus_wait(180)
+ : integrated_menus(false)
+ , show_menus_wait(180)
 , always_show_menus(false)
 , fadein(100)
 , fadeout(120)
diff --git a/unity-shared/MenuManager.h b/unity-shared/MenuManager.h
index fed7d157c..94974666a 100644
--- a/unity-shared/MenuManager.h
+++ b/unity-shared/MenuManager.h
@@ -46,6 +46,8 @@ public:
 typedef std::shared_ptr<Manager> Ptr;
 
 nux::Property<bool> show_menus;
+
+ nux::Property<bool> integrated_menus;
 nux::Property<unsigned> show_menus_wait;
 nux::Property<bool> always_show_menus;
 
diff --git a/unity-shared/UnitySettings.cpp b/unity-shared/UnitySettings.cpp
index 7498d7fb3..0e43a5e57 100644
--- a/unity-shared/UnitySettings.cpp
+++ b/unity-shared/UnitySettings.cpp
@@ -38,7 +38,6 @@ Settings* settings_instance = nullptr;
 const std::string SETTINGS_NAME = "com.canonical.Unity";
 const std::string FORM_FACTOR = "form-factor";
 const std::string DOUBLE_CLICK_ACTIVATE = "double-click-activate";
-const std::string LIM_KEY = "integrated-menus";
 
 const std::string LIM_SETTINGS = "com.canonical.Unity.IntegratedMenus";
 const std::string CLICK_MOVEMENT_THRESHOLD = "click-movement-threshold";
@@ -113,10 +112,6 @@ public:
 parent_->double_click_activate.changed.emit(cached_double_click_activate_);
 });
 
- signals_.Add<void, GSettings*, const gchar*>(usettings_, "changed::" + LIM_KEY, [this] (GSettings*, const gchar*) {
- UpdateLimSetting();
- });
-
 signals_.Add<void, GSettings*, const gchar*>(ubuntu_ui_settings_, "changed::" + SCALE_FACTOR, [this] (GSettings*, const gchar* t) {
 UpdateDPI();
 });
@@ -190,7 +185,6 @@ public:
 
 void UpdateLimSetting()
 {
- decoration::Style::Get()->integrated_menus = g_settings_get_boolean(usettings_, LIM_KEY.c_str());
 parent_->lim_movement_thresold = g_settings_get_uint(lim_settings_, CLICK_MOVEMENT_THRESHOLD.c_str());
 parent_->lim_double_click_wait = g_settings_get_uint(lim_settings_, DOUBLE_CLICK_WAIT.c_str());
 }