Unity

Merge lp:~nick-dedekind/unity/lp1053316.dash-input-form-factor into lp:unity

  1. lp1053316.dash-input-form-factor
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Merged at revision: 2730
Proposed branch: lp:~nick-dedekind/unity/lp1053316.dash-input-form-factor
Merge into: lp:unity
Diff against target: 28 lines (+3/-4)
2 files modified
dash/DashController.cpp (+3/-0)
dash/DashView.cpp (+0/-4)
To merge this branch: bzr merge lp:~nick-dedekind/unity/lp1053316.dash-input-form-factor
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+125449@code.launchpad.net

Commit message

Relayout dash input window when form factor changes (LP#1053316)

Description of the change

Relayout dash input window when form factor changes (LP#1053316)

To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp 2012-09-19 19:54:05 +0000
+++ dash/DashController.cpp 2012-09-20 10:21:19 +0000
@@ -79,6 +79,9 @@
79 {79 {
80 if (window_ && view_ && visible_)80 if (window_ && view_ && visible_)
81 {81 {
82 // Relayout here so the input window size updates.
83 Relayout();
84
82 window_->PushToFront();85 window_->PushToFront();
83 window_->SetInputFocus();86 window_->SetInputFocus();
84 nux::GetWindowCompositor().SetKeyFocusArea(view_->default_focus());87 nux::GetWindowCompositor().SetKeyFocusArea(view_->default_focus());
8588
=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp 2012-09-19 22:45:01 +0000
+++ dash/DashView.cpp 2012-09-20 10:21:19 +0000
@@ -107,10 +107,6 @@
107 SetupViews();107 SetupViews();
108 SetupUBusConnections();108 SetupUBusConnections();
109109
110 Settings::Instance().form_factor.changed.connect([this](FormFactor) {
111 Relayout();
112 });
113
114 lenses_.lens_added.connect(sigc::mem_fun(this, &DashView::OnLensAdded));110 lenses_.lens_added.connect(sigc::mem_fun(this, &DashView::OnLensAdded));
115 mouse_down.connect(sigc::mem_fun(this, &DashView::OnMouseButtonDown));111 mouse_down.connect(sigc::mem_fun(this, &DashView::OnMouseButtonDown));
116 preview_state_machine_.PreviewActivated.connect(sigc::mem_fun(this, &DashView::BuildPreview));112 preview_state_machine_.PreviewActivated.connect(sigc::mem_fun(this, &DashView::BuildPreview));