Merge lp:~3v1n0/unity/launchers-resize-new into lp:unity

[Marco Trevisan (Treviño)]

Launcher: improve the monitor resizing and background color management, tune the standalone version.

Misc cleanup in Launcher, added a single property in options to manage the launcher background color, using the monitor property to handle monitor changes.

Improved the launcher standalone, so that the view now matches the window size.

Added new tests.

[Andrea Azzarone (azzar1)]

LGTM. Can't see any regression here and all tests pass.

review: Approve

[Andrea Azzarone (azzar1)]

*regressions :)

[MC Return (mc-return)]

Approved on 2012-11-29.
Will this ever land ?
I guess something's wrong here :)

[Martin Mrazik (mrazik)]

This is weird as I have a watchdog which is looking for approved but unmerged MPs. The watchdog noticed this MP only after you made the comment so I assume there was something wrong on the launchpad side.

[Martin Mrazik (mrazik)]

Oh, now I actually see it. It didn't merge previously because the prerequisite was merged only a while ago.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/316/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/316/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/316/console

review: Needs Fixing (continuous-integration)

[Łukasz Zemczak (sil2100)]

This branch needs re-merging with trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/317/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/317/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/317/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/320/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/320/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/320/console

review: Needs Fixing (continuous-integration)

=== modified file 'launcher/EdgeBarrierController.h'
--- launcher/EdgeBarrierController.h	2012-07-25 23:18:17 +0000
+++ launcher/EdgeBarrierController.h	2013-01-18 18:26:28 +0000
@@ -26,9 +26,8 @@
 namespace unity {
 namespace ui {
 
-class EdgeBarrierSubscriber
+struct EdgeBarrierSubscriber
 {
-public:
   virtual bool HandleBarrierEvent(PointerBarrierWrapper* owner, BarrierEvent::Ptr event) = 0;
 };
 
 
=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2013-01-17 23:44:13 +0000
+++ launcher/Launcher.cpp	2013-01-18 18:26:28 +0000
@@ -144,7 +144,7 @@
   , _drag_gesture_ongoing(false)
   , _last_reveal_progress(0.0f)
   , _selection_atom(0)
-  , _background_color(nux::color::DimGray)
+  , icon_renderer(std::make_shared<ui::IconRenderer>())
 {
   m_Layout = new nux::HLayout(NUX_TRACKER_LOCATION);
 
@@ -190,13 +190,8 @@
 
   ubus_.RegisterInterest(UBUS_OVERLAY_SHOWN, sigc::mem_fun(this, &Launcher::OnOverlayShown));
   ubus_.RegisterInterest(UBUS_OVERLAY_HIDDEN, sigc::mem_fun(this, &Launcher::OnOverlayHidden));
-  ubus_.RegisterInterest(UBUS_BACKGROUND_COLOR_CHANGED, sigc::mem_fun(this, &Launcher::OnBGColorChanged));
   ubus_.RegisterInterest(UBUS_LAUNCHER_LOCK_HIDE, sigc::mem_fun(this, &Launcher::OnLockHideChanged));
 
-  // request the latest colour from bghash
-  ubus_.SendMessage(UBUS_BACKGROUND_REQUEST_COLOUR_EMIT);
-
-  icon_renderer = ui::AbstractIconRenderer::Ptr(new ui::IconRenderer());
   icon_renderer->SetTargetSize(_icon_size, _icon_image_size, _space_between_icons);
 
   TextureCache& cache = TextureCache::GetDefault();
@@ -208,6 +203,7 @@
   launcher_pressure_effect_ = cache.FindTexture("launcher_pressure_effect", 0, 0, cb);
 
   options.changed.connect(sigc::mem_fun(this, &Launcher::OnOptionsChanged));
+  monitor.changed.connect(sigc::mem_fun(this, &Launcher::OnMonitorChanged));
 }
 
 /* Introspection */
@@ -989,7 +985,7 @@
   struct timespec current;
   clock_gettime(CLOCK_MONOTONIC, &current);
 
-  nux::Color colorify = FullySaturateColor(_background_color);
+  nux::Color const& colorify = FullySaturateColor(options()->background_color);
 
   float hover_progress = GetHoverProgress(current);
   float folded_z_distance = _folded_z_distance * (1.0f - hover_progress);
@@ -1171,17 +1167,6 @@
   EnsureAnimation();
 }
 
-void Launcher::OnBGColorChanged(GVariant *data)
-{
-  ui::IconRenderer::DestroyShortcutTextures();
-
-  double red = 0.0f, green = 0.0f, blue = 0.0f, alpha = 0.0f;
-
-  g_variant_get(data, "(dddd)", &red, &green, &blue, &alpha);
-  _background_color = nux::Color(red, green, blue, alpha);
-  QueueDraw();
-}
-
 void Launcher::OnLockHideChanged(GVariant *data)
 {
   gboolean enable_lock = FALSE;
@@ -1390,6 +1375,16 @@
   UpdateOptions(options());
 }
 
+void Launcher::OnMonitorChanged(int new_monitor)
+{
+  UScreen* uscreen = UScreen::GetDefault();
+  auto monitor_geo = uscreen->GetMonitorGeometry(new_monitor);
+  unity::panel::Style &panel_style = panel::Style::Instance();
+
+  Resize(nux::Point(monitor_geo.x, monitor_geo.y + panel_style.panel_height),
+         monitor_geo.height - panel_style.panel_height);
+}
+
 void Launcher::UpdateOptions(Options::Ptr options)
 {
   SetIconSize(options->tile_size, options->icon_size);
@@ -1574,24 +1569,21 @@
 
   icon_renderer->SetTargetSize(_icon_size, _icon_image_size, _space_between_icons);
 
-  Resize();
+  nux::Geometry const& parent_geo = _parent->GetGeometry();
+  Resize(nux::Point(parent_geo.x, parent_geo.y), parent_geo.height);
 }
 
 int Launcher::GetIconSize() const
 {
-    return _icon_size;
+  return _icon_size;
 }
 
-void Launcher::Resize()
+void Launcher::Resize(nux::Point const& offset, int height)
 {
-  UScreen* uscreen = UScreen::GetDefault();
-  auto geo = uscreen->GetMonitorGeometry(monitor());
-  unity::panel::Style &panel_style = panel::Style::Instance();
-  int width = _icon_size + ICON_PADDING*2 + RIGHT_LINE_WIDTH - 2;
-  nux::Geometry new_geometry(geo.x, geo.y + panel_style.panel_height, width, geo.height - panel_style.panel_height);
-  SetMaximumHeight(new_geometry.height);
-  _parent->SetGeometry(new_geometry);
-  SetGeometry(nux::Geometry(0, 0, new_geometry.width, new_geometry.height));
+  unsigned width = _icon_size + ICON_PADDING * 2 + RIGHT_LINE_WIDTH - 2;
+  _parent->SetGeometry(nux::Geometry(offset.x, offset.y, width, height));
+  SetGeometry(nux::Geometry(0, 0, width, height));
+  SetMaximumHeight(height);
 
   ConfigureBarrier();
 }
@@ -1722,7 +1714,7 @@
   
   if (Settings::Instance().GetLowGfxMode())
   {
-    clear_colour = _background_color;
+    clear_colour = options()->background_color;
     clear_colour.alpha = 1.0f;
   }
 
@@ -1796,7 +1788,7 @@
 					    blur_texture,
 					    texxform_blur_bg,
 					    nux::color::White,
-					    _background_color, nux::LAYER_BLEND_MODE_OVERLAY,
+					    options()->background_color, nux::LAYER_BLEND_MODE_OVERLAY,
 					    true, ROP);
 	else
 	  gPainter.PushDrawTextureLayer(GfxContext, base,
@@ -1810,7 +1802,7 @@
 					    blur_texture,
 					    texxform_blur_bg,
 					    nux::color::White,
-					    _background_color, nux::LAYER_BLEND_MODE_OVERLAY,
+					    options()->background_color, nux::LAYER_BLEND_MODE_OVERLAY,
 					    true, ROP);
 #endif
 	GfxContext.PopClippingRectangle();
@@ -1829,7 +1821,7 @@
       // apply the bg colour
 #ifndef NUX_OPENGLES_20
       if (GfxContext.UsingGLSLCodePath() == false)
-	gPainter.Paint2DQuadColor(GfxContext, bkg_box, _background_color);
+	gPainter.Paint2DQuadColor(GfxContext, bkg_box, options()->background_color);
 #endif
 
       // apply the shine
@@ -1849,7 +1841,7 @@
     }
     else
     {
-      nux::Color color = _background_color;
+      nux::Color color = options()->background_color;
       color.alpha = options()->background_alpha;
       gPainter.Paint2DQuadColor(GfxContext, bkg_box, color);
     }
 
=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-11-15 19:46:04 +0000
+++ launcher/Launcher.h	2013-01-18 18:26:28 +0000
@@ -121,7 +121,7 @@
   int GetMouseX() const;
   int GetMouseY() const;
 
-  void Resize();
+  void Resize(nux::Point const& offset, int height);
 
   int GetDragDelta() const;
   void SetHover(bool hovered);
@@ -196,6 +196,7 @@
 
   void ConfigureBarrier();
 
+  void OnMonitorChanged(int monitor);
   void OnOptionsChanged(Options::Ptr options);
   void OnOptionChanged();
   void UpdateOptions(Options::Ptr options);
@@ -392,7 +393,6 @@
 
   struct timespec  _times[TIME_LAST];
 
-  nux::Color _background_color;
   BaseTexturePtr launcher_sheen_;
   BaseTexturePtr launcher_pressure_effect_;
 
 
=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2013-01-08 11:47:00 +0000
+++ launcher/LauncherController.cpp	2013-01-18 18:26:28 +0000
@@ -40,6 +40,7 @@
 #include "ExpoLauncherIcon.h"
 #include "TrashLauncherIcon.h"
 #include "BFBLauncherIcon.h"
+#include "unity-shared/IconRenderer.h"
 #include "unity-shared/UScreen.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/TimeUtil.h"
@@ -119,6 +120,17 @@
   edge_barriers_.options = parent_->options();
 #endif
 
+  ubus.RegisterInterest(UBUS_BACKGROUND_COLOR_CHANGED, [this](GVariant * data) {
+    ui::IconRenderer::DestroyShortcutTextures();
+
+    double red = 0.0f, green = 0.0f, blue = 0.0f, alpha = 0.0f;
+    g_variant_get(data, "(dddd)", &red, &green, &blue, &alpha);
+    parent_->options()->background_color = nux::Color(red, green, blue, alpha);
+  });
+
+  // request the latest color from bghash
+  ubus.SendMessage(UBUS_BACKGROUND_REQUEST_COLOUR_EMIT);
+
   UScreen* uscreen = UScreen::GetDefault();
   EnsureLaunchers(uscreen->GetPrimaryMonitor(), uscreen->GetMonitors());
 
@@ -148,7 +160,7 @@
   wm.window_focus_changed.connect(sigc::mem_fun(this, &Controller::Impl::OnWindowFocusChanged));
   wm.viewport_layout_changed.connect(sigc::group(sigc::mem_fun(this, &Controller::Impl::UpdateNumWorkspaces), sigc::_1 * sigc::_2));
 
-  ubus.RegisterInterest(UBUS_QUICKLIST_END_KEY_NAV, [&](GVariant * args) {
+  ubus.RegisterInterest(UBUS_QUICKLIST_END_KEY_NAV, [this](GVariant * args) {
     if (reactivate_keynav)
       parent_->KeyNavGrab();
 
@@ -197,24 +209,27 @@
   {
     if (i >= launchers_size)
     {
-      launchers.push_back(nux::ObjectPtr<Launcher>(CreateLauncher(i)));
+      launchers.push_back(nux::ObjectPtr<Launcher>(CreateLauncher()));
     }
     else if (!launchers[i])
     {
-      launchers[i] = nux::ObjectPtr<Launcher>(CreateLauncher(i));
+      launchers[i] = nux::ObjectPtr<Launcher>(CreateLauncher());
     }
 
     int monitor = (num_launchers == 1) ? primary : i;
 
-#ifdef USE_X11
     if (launchers[i]->monitor() != monitor)
     {
+#ifdef USE_X11
       edge_barriers_.Unsubscribe(launchers[i].GetPointer(), launchers[i]->monitor);
-    }
 #endif
+      launchers[i]->monitor = monitor;
+    }
+    else
+    {
+      launchers[i]->monitor.changed(monitor);
+    }
 
-    launchers[i]->monitor(monitor);
-    launchers[i]->Resize();
 #ifdef USE_X11
     edge_barriers_.Subscribe(launchers[i].GetPointer(), launchers[i]->monitor);
 #endif
@@ -222,7 +237,7 @@
 
   for (unsigned int i = last_launcher; i < launchers_size; ++i)
   {
-    auto launcher = launchers[i];
+    auto const& launcher = launchers[i];
     if (launcher)
     {
       parent_->RemoveChild(launcher.GetPointer());
@@ -297,12 +312,11 @@
  }
 }
 
-Launcher* Controller::Impl::CreateLauncher(int monitor)
+Launcher* Controller::Impl::CreateLauncher()
 {
   nux::BaseWindow* launcher_window = new nux::BaseWindow(TEXT("LauncherWindow"));
 
   Launcher* launcher = new Launcher(launcher_window);
-  launcher->monitor = monitor;
   launcher->options = parent_->options();
   launcher->SetModel(model_);
 
 
=== modified file 'launcher/LauncherControllerPrivate.h'
--- launcher/LauncherControllerPrivate.h	2012-12-07 04:21:35 +0000
+++ launcher/LauncherControllerPrivate.h	2013-01-18 18:26:28 +0000
@@ -54,7 +54,7 @@
 
   void UpdateNumWorkspaces(int workspaces);
 
-  Launcher* CreateLauncher(int monitor);
+  Launcher* CreateLauncher();
 
   void SaveIconsOrder();
   void SortAndUpdate();
 
=== modified file 'launcher/LauncherOptions.cpp'
--- launcher/LauncherOptions.cpp	2012-12-14 18:12:52 +0000
+++ launcher/LauncherOptions.cpp	2013-01-18 18:26:28 +0000
@@ -33,9 +33,10 @@
   , auto_hide_animation(FADE_AND_SLIDE)
   , backlight_mode(BACKLIGHT_NORMAL)
   , reveal_trigger(RevealTrigger::EDGE)
+  , background_color(nux::Color(95, 18, 45))
+  , background_alpha(0.6667)
   , icon_size(48)
   , tile_size(54)
-  , background_alpha(0.6667)
   , edge_decay_rate(1500)
   , edge_overcome_pressure(2000)
   , edge_stop_velocity(6500)
@@ -51,6 +52,7 @@
 
   auto_hide_animation.changed.connect(sigc::hide(changed_lambda));
   background_alpha.changed.connect(sigc::hide(changed_lambda));
+  background_color.changed.connect(sigc::hide(changed_lambda));
   backlight_mode.changed.connect(sigc::hide(changed_lambda));
   edge_decay_rate.changed.connect(sigc::hide(changed_lambda));
   edge_overcome_pressure.changed.connect(sigc::hide(changed_lambda));
 
=== modified file 'launcher/LauncherOptions.h'
--- launcher/LauncherOptions.h	2012-12-14 18:12:52 +0000
+++ launcher/LauncherOptions.h	2013-01-18 18:26:28 +0000
@@ -89,9 +89,10 @@
   nux::Property<AutoHideAnimation> auto_hide_animation;
   nux::Property<BacklightMode> backlight_mode;
   nux::Property<RevealTrigger> reveal_trigger;
+  nux::Property<nux::Color> background_color;
+  nux::Property<float> background_alpha;
   nux::Property<int> icon_size;
   nux::Property<int> tile_size;
-  nux::Property<float> background_alpha;
   nux::Property<int> edge_decay_rate;
   nux::Property<int> edge_overcome_pressure;
   nux::Property<int> edge_stop_velocity;
 
=== modified file 'launcher/StandaloneLauncher.cpp'
--- launcher/StandaloneLauncher.cpp	2013-01-17 14:09:35 +0000
+++ launcher/StandaloneLauncher.cpp	2013-01-18 18:26:28 +0000
@@ -27,35 +27,75 @@
 #include "Launcher.h"
 #include "unity-shared/IconRenderer.h"
 #include "unity-shared/PanelStyle.h"
+#include "unity-shared/UBusMessages.h"
 #include "unity-shared/UnitySettings.h"
+#include "unity-shared/UScreen.h"
 
 using namespace unity;
 
-static launcher::Controller::Ptr controller;
-
-void ThreadWidgetInit(nux::NThread* thread, void* InitData)
+namespace
 {
-  auto xdnd_manager = std::make_shared<XdndManager>();
-  controller = std::make_shared<launcher::Controller>(xdnd_manager);
+const nux::Size win_size(1024, 768);
+const nux::Color bg_color(95/255.0f, 18/255.0f, 45/255.0f, 1.0f);
 }
 
+struct LauncherWindow
+{
+  LauncherWindow()
+    : wt(nux::CreateGUIThread("Unity Launcher", win_size.width, win_size.height, 0, &LauncherWindow::ThreadWidgetInit, this))
+  {}
+
+  void Show()
+  {
+    wt->Run(nullptr);
+  }
+
+private:
+  void SetupBackground()
+  {
+    nux::ObjectPtr<nux::BaseTexture> background_tex;
+    background_tex.Adopt(nux::CreateTextureFromFile("/usr/share/backgrounds/warty-final-ubuntu.png"));
+    nux::TexCoordXForm texxform;
+    auto tex_layer = std::make_shared<nux::TextureLayer>(background_tex->GetDeviceTexture(), texxform, nux::color::White);
+    wt->SetWindowBackgroundPaintLayer(tex_layer.get());
+  }
+
+  void Init()
+  {
+    SetupBackground();
+    controller.reset(new launcher::Controller(std::make_shared<XdndManager>()));
+    controller->launcher().GetParent()->EnableInputWindow(false);
+
+    UScreen* uscreen = UScreen::GetDefault();
+    std::vector<nux::Geometry> fake_monitor({nux::Geometry(0, 0, win_size.width, win_size.height)});
+    uscreen->changed.emit(0, fake_monitor);
+    uscreen->changed.clear();
+    controller->launcher().Resize(nux::Point(), win_size.height);
+
+    wt->window_configuration.connect([this] (int x, int y, int w, int h) {
+      controller->launcher().Resize(nux::Point(), h);
+    });
+  }
+
+  static void ThreadWidgetInit(nux::NThread* thread, void* self)
+  {
+    static_cast<LauncherWindow*>(self)->Init();
+  }
+
+  internal::FavoriteStoreGSettings favorite_store;
+  unity::Settings settings;
+  panel::Style panel_style;
+  std::shared_ptr<nux::WindowThread> wt;
+  launcher::Controller::Ptr controller;
+};
+
 int main(int argc, char** argv)
 {
   gtk_init(&argc, &argv);
   nux::NuxInitialize(0);
 
-  unity::Settings settings;
-  panel::Style panel_style;
-  internal::FavoriteStoreGSettings favorite_store;
-
-  BackgroundEffectHelper::blur_type = BLUR_NONE;
-  nux::WindowThread* wt = nux::CreateGUIThread(TEXT("Unity Switcher"), 300, 800, 0, &ThreadWidgetInit, 0);
-
-  wt->Run(NULL);
-  // Make sure the controller is destroyed before the window thread.
-  controller.reset();
-  ::unity::ui::IconRenderer::DestroyTextures();
-
-  delete wt;
+  LauncherWindow lc;
+  lc.Show();
+
   return 0;
 }
 
=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2013-01-14 23:11:05 +0000
+++ tests/test_launcher_controller.cpp	2013-01-18 18:26:28 +0000
@@ -327,7 +327,7 @@
 
   for (int i = 0; i < max_num_monitors; ++i)
   {
-    EXPECT_EQ(lc.launchers()[i]->monitor(), i);
+    ASSERT_EQ(lc.launchers()[i]->monitor(), i);
   }
 }
 
@@ -389,7 +389,7 @@
   ASSERT_EQ(lc.launchers().size(), max_num_monitors - 1);
 
   for (int i = 0; i < max_num_monitors - 1; ++i)
-    EXPECT_EQ(lc.launchers()[i]->monitor(), i);
+    ASSERT_EQ(lc.launchers()[i]->monitor(), i);
 }
 
 TEST_F(TestLauncherController, SingleMonitorSwitchToMultimonitor)
@@ -436,6 +436,20 @@
 
 #endif
 
+TEST_F(TestLauncherController, MultimonitorGeometries)
+{
+  uscreen.SetupFakeMultiMonitor();
+
+  for (int i = 0; i < max_num_monitors; ++i)
+  {
+    auto const& monitor_geo = uscreen.GetMonitorGeometry(i);
+    auto const& launcher_geo = lc.launchers()[i]->GetAbsoluteGeometry();
+    ASSERT_EQ(launcher_geo.x, monitor_geo.x);
+    ASSERT_EQ(launcher_geo.y, monitor_geo.y + panel_style.panel_height);
+    ASSERT_EQ(launcher_geo.height, monitor_geo.height - panel_style.panel_height);
+  }
+}
+
 TEST_F(TestLauncherController, OnlyUnstickIconOnFavoriteRemoval)
 {
   const std::string desktop = app::BZR_HANDLE_PATCH;
@@ -1555,6 +1569,14 @@
   ASSERT_EQ(lc.Impl()->model_->Selection()->tooltip_text(), last_selection_change);
 }
 
+TEST_F(TestLauncherController, UpdateLaunchersBackgroundColor)
+{
+  UBusManager().SendMessage(UBUS_BACKGROUND_COLOR_CHANGED,
+                            g_variant_new("(dddd)", 11/255.0f, 22/255.0f, 33/255.0f, 1.0f));
+
+  Utils::WaitUntil([this] { return lc.options()->background_color == nux::Color(11, 22, 33); });
+}
+
 // thumper: 2012-11-28 disabling the drag and drop tests as they are taking over 20s
 // each, and that is not acceptable for unit tests.  These sound more like functional
 // tests.
 
=== modified file 'tests/test_uscreen_mock.h'
--- tests/test_uscreen_mock.h	2012-07-24 20:22:08 +0000
+++ tests/test_uscreen_mock.h	2013-01-18 18:26:28 +0000
@@ -44,16 +44,17 @@
       default_screen_ = nullptr;
   }
 
-  void Reset(bool emit = true)
+  void Reset(bool emit_change = true)
   {
     default_screen_ = this;
     primary_ = 0;
     monitors_ = {nux::Geometry(0, 0, MONITOR_WIDTH, MONITOR_HEIGHT)};
 
-    changed.emit(primary_, monitors_);
+    if (emit_change)
+      changed.emit(primary_, monitors_);
   }
 
-  void SetupFakeMultiMonitor(int primary = 0, bool emit_update = true)
+  void SetupFakeMultiMonitor(int primary = 0, bool emit_change = true)
   {
     SetPrimary(primary, false);
     monitors_.clear();
@@ -63,7 +64,7 @@
       monitors_.push_back(nux::Geometry(MONITOR_WIDTH, MONITOR_HEIGHT, total_width, 0));
       total_width += MONITOR_WIDTH;
 
-      if (emit_update)
+      if (emit_change)
         changed.emit(GetPrimaryMonitor(), GetMonitors());
     }
   }