Unity

Merge lp:~3v1n0/unity/panel-title-maximized-on-restart-title-fix into lp:unity

  1. panel-title-maximized-on-restart-title-fix
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 4066
Proposed branch: lp:~3v1n0/unity/panel-title-maximized-on-restart-title-fix
Merge into: lp:unity
Diff against target: 11 lines (+0/-1)
1 file modified
panel/PanelMenuView.cpp (+0/-1)
To merge this branch: bzr merge lp:~3v1n0/unity/panel-title-maximized-on-restart-title-fix
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+280730@code.launchpad.net

Commit message

PanelMenuView: ensure that the maximized window is computed when setting the monitor

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:4055
http://jenkins.qa.ubuntu.com/job/unity-ci/1388/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/40

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1388/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp 2015-11-05 14:54:13 +0000
+++ panel/PanelMenuView.cpp 2015-12-16 15:22:39 +0000
@@ -179,7 +179,6 @@
179 window_buttons_ = new WindowButtons();179 window_buttons_ = new WindowButtons();
180 window_buttons_->SetParentObject(this);180 window_buttons_->SetParentObject(this);
181 window_buttons_->monitor = monitor_;181 window_buttons_->monitor = monitor_;
182 window_buttons_->controlled_window = active_window();
183 window_buttons_->opacity = 0.0f;182 window_buttons_->opacity = 0.0f;
184 window_buttons_->SetLeftAndRightPadding(MAIN_LEFT_PADDING, MENUBAR_PADDING);183 window_buttons_->SetLeftAndRightPadding(MAIN_LEFT_PADDING, MENUBAR_PADDING);
185 window_buttons_->SetMaximumHeight(panel::Style::Instance().PanelHeight(monitor_));184 window_buttons_->SetMaximumHeight(panel::Style::Instance().PanelHeight(monitor_));