summaryrefslogtreecommitdiff
path: root/dash
diff options
authorhandsome_feng <445865575@qq.com>2015-12-11 16:49:36 +0800
committerhandsome_feng <445865575@qq.com>2015-12-11 16:49:36 +0800
commitfc9cda8098a9a87d9662c57880770b4a0c85b7db (patch)
tree714cea7487992e863a2e98942dbce490ac607825 /dash
parent4c796b9d968cd395d0096d56e3ff3bd5402c3ebc (diff)
update
(bzr r3999.7.11)
Diffstat (limited to 'dash')
-rw-r--r--dash/DashController.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/dash/DashController.cpp b/dash/DashController.cpp
index 64aa27609..38a29449c 100644
--- a/dash/DashController.cpp
+++ b/dash/DashController.cpp
@@ -232,25 +232,23 @@ nux::Geometry Controller::GetIdealWindowGeometry()
{
UScreen *uscreen = UScreen::GetDefault();
auto monitor_geo = uscreen->GetMonitorGeometry(GetIdealMonitor());
+ int launcher_size = unity::Settings::Instance().LauncherSize(monitor_);
if (Settings::Instance().launcher_position() == LauncherPosition::LEFT)
{
- int launcher_width = unity::Settings::Instance().LauncherSize(monitor_);
-
- // We want to cover as much of the screen as possible to grab any mouse events outside
- // of our window
- return nux::Geometry (monitor_geo.x + launcher_width,
+ // We want to cover as much of the screen as possible to grab any mouse events outside
+ // of our window
+ return nux::Geometry (monitor_geo.x + launcher_size,
monitor_geo.y,
- monitor_geo.width - launcher_width,
+ monitor_geo.width - launcher_size,
monitor_geo.height);
}
else
{
- int launcher_height = unity::Settings::Instance().LauncherSize(monitor_);
return nux::Geometry (monitor_geo.x,
monitor_geo.y,
monitor_geo.width,
- monitor_geo.height - launcher_height );
+ monitor_geo.height - launcher_size );
}
}