summaryrefslogtreecommitdiff
diff options
authorMarco Trevisan (TreviƱo) <mail@3v1n0.net>2015-12-18 00:01:31 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2015-12-18 00:01:31 +0000
commitf688b690a29e55c3000be286e5bbb73d94c3f0c5 (patch)
tree18d19a8fc1d9b398c79d87dc13f1c3acd84e94a9
parente0af9581780becee3b8bf46ac93cead4d1242935 (diff)
parentd183cfcab8f48db111976f6464d0a03c825a07e0 (diff)
PanelMenuView: ensure that the maximized window is computed when setting the monitor Fixes: #1526835
Approved by: PS Jenkins bot, Andrea Azzarone (bzr r4066)
-rw-r--r--panel/PanelMenuView.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/panel/PanelMenuView.cpp b/panel/PanelMenuView.cpp
index eb45367f3..f2aa86053 100644
--- a/panel/PanelMenuView.cpp
+++ b/panel/PanelMenuView.cpp
@@ -179,7 +179,6 @@ void PanelMenuView::SetupWindowButtons()
window_buttons_ = new WindowButtons();
window_buttons_->SetParentObject(this);
window_buttons_->monitor = monitor_;
- window_buttons_->controlled_window = active_window();
window_buttons_->opacity = 0.0f;
window_buttons_->SetLeftAndRightPadding(MAIN_LEFT_PADDING, MENUBAR_PADDING);
window_buttons_->SetMaximumHeight(panel::Style::Instance().PanelHeight(monitor_));