15882de · unity8 · git.iko.soy

git.iko.soy/unity8

Set phone form factor for scope requests.

Approved by PS Jenkins bot, Michał Sawicz.

commit15882de41bba53cd35d277b46ef2ab794eb78998 authorMichal Hruby <michal.mhr@gmail.com> dateFri 9 Aug 2013, 14:15 (13 years ago) parentc2dc269 6067a46

2 files changed+5−3

compare with xenial

unifiedsplit

Dash/ScopeView.qml+2−1 plugins/Unity/scope.cpp+3−2

Dash/ScopeView.qml+2−1

@@ -28,7 +28,8 @@ FocusScope {

2828 signal movementStarted

2929 signal positionedAtBeginning

3030

31− // FIXME delay the search so that daemons have time to settle

31+ // FIXME delay the search so that daemons have time to settle, note that

32+ // removing this will break ScopeView::test_changeScope

3233 onScopeChanged: timer.restart()

3334

3435 Timer {

plugins/Unity/scope.cpp+3−2

@@ -36,8 +36,8 @@

3636

3737#include <libintl.h>

3838

39−Scope::Scope(QObject *parent) :

40− QObject(parent)

39+Scope::Scope(QObject *parent) : QObject(parent)

40+ , m_formFactor("phone")

4141{

4242 m_categories.reset(new Categories(this));

4343}

@@ -128,6 +128,7 @@ void Scope::setFormFactor(const QString& form_factor) {

128128 m_formFactor = form_factor;

129129 if (m_unityScope) {

130130 m_unityScope->form_factor = m_formFactor.toStdString();

131+ synchronizeStates(); // will trigger a re-search

131132 }

132133 Q_EMIT formFactorChanged();

133134 }