diff options
| author | handsome_feng <445865575@qq.com> | 2015-11-11 16:01:50 +0800 |
|---|---|---|
| committer | handsome_feng <445865575@qq.com> | 2015-11-11 16:01:50 +0800 |
| commit | 105aac52fecb82a4bcfdaeb748dc4056ea7c1411 (patch) | |
| tree | c496d4befe9ea9bb4a78dc82b713535b18f095c0 /dash | |
| parent | b21cd4c3c835a574f771e2b8b62c5735b8536e76 (diff) | |
use launchersize instead of launcherWidth/launcherHeight
(bzr r3999.7.3)
Diffstat (limited to 'dash')
| -rw-r--r-- | dash/DashController.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/dash/DashController.cpp b/dash/DashController.cpp index 43d21f8db..ed50d39dd 100644 --- a/dash/DashController.cpp +++ b/dash/DashController.cpp @@ -235,8 +235,7 @@ nux::Geometry Controller::GetIdealWindowGeometry() if (Settings::Instance().launcher_position() == LauncherPosition::LEFT) { - std::cout << "Launcher_widht: " << std::endl; - int launcher_width = unity::Settings::Instance().LauncherWidth(monitor_); + 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 @@ -247,8 +246,7 @@ nux::Geometry Controller::GetIdealWindowGeometry() } else { - int launcher_height = unity::Settings::Instance().LauncherHeight(monitor_); - std::cout << "launcher_heigth: " << launcher_height << std::endl; + int launcher_height = unity::Settings::Instance().LauncherSize(monitor_); return nux::Geometry (monitor_geo.x, monitor_geo.y, monitor_geo.width, @@ -270,7 +268,7 @@ void Controller::Relayout(bool check_monitor) window_->SetGeometry(geo); if (Settings::Instance().launcher_position() == LauncherPosition::LEFT) { - int launcher_width = unity::Settings::Instance().LauncherWidth(monitor_); + int launcher_width = unity::Settings::Instance().LauncherSize(monitor_); view_->SetMonitorOffset(launcher_width, panel::Style::Instance().PanelHeight(monitor_)); } else @@ -335,7 +333,7 @@ bool Controller::ShowDash() screen_ungrabbed_slot_->disconnect(); if (Settings::Instance().launcher_position() == LauncherPosition::LEFT) { - int launcher_width = unity::Settings::Instance().LauncherWidth(monitor_); + int launcher_width = unity::Settings::Instance().LauncherSize(monitor_); view_->SetMonitorOffset(launcher_width, panel::Style::Instance().PanelHeight(monitor_)); } else |