From 9eca5faa9ba0d18a77165b363065667ec86fc655 Mon Sep 17 00:00:00 2001 From: Tim Penhey Date: Tue, 25 Oct 2011 15:37:13 -0400 Subject: Tweaks from trunk found during compile. (bzr r1635.1.34) --- plugins/unityshell/src/FilterExpanderLabel.cpp | 10 ++++------ plugins/unityshell/src/unityshell.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'plugins') diff --git a/plugins/unityshell/src/FilterExpanderLabel.cpp b/plugins/unityshell/src/FilterExpanderLabel.cpp index 6d33d8c14..59015af1d 100644 --- a/plugins/unityshell/src/FilterExpanderLabel.cpp +++ b/plugins/unityshell/src/FilterExpanderLabel.cpp @@ -26,7 +26,7 @@ #include "FilterBasicButton.h" #include "FilterExpanderLabel.h" -#include "PlacesStyle.h" +#include "DashStyle.h" namespace unity { @@ -74,11 +74,9 @@ NUX_IMPLEMENT_OBJECT_TYPE(FilterExpanderLabel); void FilterExpanderLabel::BuildLayout () { - PlacesStyle *style = PlacesStyle::GetDefault(); - layout_ = new nux::VLayout(NUX_TRACKER_LOCATION); top_bar_layout_ = new nux::HLayout(NUX_TRACKER_LOCATION); - + cairo_label_ = new nux::StaticText(label_.c_str(), NUX_TRACKER_LOCATION); cairo_label_->SetFontName("Ubuntu 10"); cairo_label_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 1.0f)); @@ -93,8 +91,8 @@ NUX_IMPLEMENT_OBJECT_TYPE(FilterExpanderLabel); top_bar_layout_->AddView (cairo_label_, 1, nux::MINOR_POSITION_LEFT, nux::MINOR_SIZE_FULL); top_bar_layout_->AddSpace(1, 1); - - top_bar_layout_->SetMaximumWidth((style->GetTileWidth() -12)*2+10); + + top_bar_layout_->SetMaximumWidth((dash::Style::Instance().GetTileWidth() -12)*2+10); layout_->AddLayout (top_bar_layout_, 0, nux::MINOR_POSITION_LEFT); layout_->SetVerticalInternalMargin(0); diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index a63f7620f..325a10c3d 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -2359,7 +2359,7 @@ void UnityScreen::OnDashRealized () { if (w->resName() == "onboard") { - Window xid = dashController->window()->GetInputWindowId(); + Window xid = dash_controller_->window()->GetInputWindowId(); XSetTransientForHint (screen->dpy(), w->id(), xid); w->raise (); } @@ -2398,9 +2398,9 @@ void UnityScreen::initLauncher() dash_controller_.reset(new dash::Controller()); dash_controller_->on_realize.connect(sigc::mem_fun(this, &UnityScreen::OnDashRealized)); - launcher->SetHideMode(Launcher::LAUNCHER_HIDE_DODGE_WINDOWS); - launcher->SetLaunchAnimation(Launcher::LAUNCH_ANIMATION_PULSE); - launcher->SetUrgentAnimation(Launcher::URGENT_ANIMATION_WIGGLE); + launcher.SetHideMode(Launcher::LAUNCHER_HIDE_DODGE_WINDOWS); + launcher.SetLaunchAnimation(Launcher::LAUNCH_ANIMATION_PULSE); + launcher.SetUrgentAnimation(Launcher::URGENT_ANIMATION_WIGGLE); ScheduleRelayout(0); -- cgit v1.2.3