Unity

Merge lp:~azzar1/unity/fix-955160 into lp:unity

  1. fix-955160
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Mirco Müller
Approved revision: no longer in the source branch.
Merged at revision: 2113
Proposed branch: lp:~azzar1/unity/fix-955160
Merge into: lp:unity
Diff against target: 12 lines (+1/-2)
1 file modified
plugins/unityshell/src/SearchBar.cpp (+1/-2)
To merge this branch: bzr merge lp:~azzar1/unity/fix-955160
Reviewer Review Type Date Requested Status
Mirco Müller (community) Approve
Review via email: mp+97449@code.launchpad.net

Description of the change

Fix a stupid regression.

To post a comment you must log in.
Revision history for this message
Mirco Müller (macslow) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/unityshell/src/SearchBar.cpp'
--- plugins/unityshell/src/SearchBar.cpp 2012-03-06 20:34:48 +0000
+++ plugins/unityshell/src/SearchBar.cpp 2012-03-14 16:38:20 +0000
@@ -184,8 +184,7 @@
184 SetLayout(layout_);184 SetLayout(layout_);
185185
186 spinner_ = new SearchBarSpinner();186 spinner_ = new SearchBarSpinner();
187 spinner_->SetMinimumHeight(SPINNER_HEIGHT);187 spinner_->SetMinMaxSize(icon->GetWidth(), SPINNER_HEIGHT);
188 spinner_->SetMaximumHeight(SPINNER_HEIGHT);
189 spinner_->mouse_click.connect(sigc::mem_fun(this, &SearchBar::OnClearClicked));188 spinner_->mouse_click.connect(sigc::mem_fun(this, &SearchBar::OnClearClicked));
190 layout_->AddView(spinner_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);189 layout_->AddView(spinner_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
191190