diff options
| author | Gord Allott <gord.allott@canonical.com> | 2012-05-22 11:15:47 +0100 |
|---|---|---|
| committer | Gord Allott <gord.allott@canonical.com> | 2012-05-22 11:15:47 +0100 |
| commit | 06a6c1ae620ef45beb38562318bbf070e26b3ff4 (patch) | |
| tree | 1dff709ed006a1bc3103612a6869a53e43164bbb /unity-standalone | |
| parent | 924f5d44dbb52fdd607c692507fe730502309452 (diff) | |
added tv form factor
(bzr r2356.2.3)
Diffstat (limited to 'unity-standalone')
| -rw-r--r-- | unity-standalone/StandaloneUnity.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/unity-standalone/StandaloneUnity.cpp b/unity-standalone/StandaloneUnity.cpp index 413433f3b..e00a992f5 100644 --- a/unity-standalone/StandaloneUnity.cpp +++ b/unity-standalone/StandaloneUnity.cpp @@ -36,7 +36,7 @@ #include "launcher/FavoriteStoreGSettings.h" #include "launcher/LauncherController.h" #include "launcher/Launcher.h" -#include "unity-shared/DashSettings.h" +#include "unity-shared/UnitySettings.h" #include "unity-shared/DashStyle.h" #include "unity-shared/PanelStyle.h" #include "unity-shared/UBusWrapper.h" @@ -70,7 +70,6 @@ public: launcher::Controller::Ptr launcher_controller; dash::Controller::Ptr dash_controller; - panel::Controller::Ptr panel_controller; }; UnityStandalone::UnityStandalone () @@ -85,8 +84,6 @@ void UnityStandalone::Init () { launcher_controller.reset(new launcher::Controller(0)); dash_controller.reset(new dash::Controller()); - panel_controller.reset(new panel::Controller()); - dash_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1; UBusManager().SendMessage(UBUS_DASH_EXTERNAL_ACTIVATION, nullptr); @@ -125,8 +122,8 @@ int main(int argc, char **argv) // The instances for the pseudo-singletons. dash::Style dash_style; - dash::Settings dash_settings; - dash_settings.SetFormFactor(dash::FormFactor::NETBOOK); + Settings dash_settings; + dash_settings.SetFormFactor(FormFactor::TV); panel::Style panel_style; GeisAdapter geis_adapter; |