summaryrefslogtreecommitdiff
path: root/unity-standalone
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2012-09-18 03:13:12 +0200
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2012-09-18 03:13:12 +0200
commitf273f705dcc769a839d8fa4549425737dd12f334 (patch)
tree5590ca5420d017fc20135293e298e5d00eeec13f /unity-standalone
parent1238bb75bb5a879506a017b9d96fe7c58e319b1a (diff)
parent1083e38c95e4e7f758de6cedac149c83425f1971 (diff)
Merging with trunk
(bzr r2529.14.147)
Diffstat (limited to 'unity-standalone')
-rw-r--r--unity-standalone/StandaloneUnity.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/unity-standalone/StandaloneUnity.cpp b/unity-standalone/StandaloneUnity.cpp
index fdc75beeb..be9e762c2 100644
--- a/unity-standalone/StandaloneUnity.cpp
+++ b/unity-standalone/StandaloneUnity.cpp
@@ -45,7 +45,7 @@
namespace
{
- static int display_width = 1280;
+ static int display_width = 1200;
static int display_height = 720;
static gboolean no_window_decorations = FALSE;
static gboolean force_tv = FALSE;
@@ -89,7 +89,9 @@ void UnityStandalone::Init ()
launcher_controller.reset(new launcher::Controller());
panel_controller.reset(new panel::Controller());
dash_controller.reset(new dash::Controller());
+
dash_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1;
+ panel_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1;
}
void UnityStandalone::InitWindowThread(nux::NThread* thread, void* InitData)