diff options
| -rw-r--r-- | lockscreen/BackgroundSettings.cpp | 5 | ||||
| -rw-r--r-- | lockscreen/LockScreenShield.cpp | 1 | ||||
| -rw-r--r-- | panel/PanelView.cpp | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lockscreen/BackgroundSettings.cpp b/lockscreen/BackgroundSettings.cpp index dce2b4d76..f7c95e36c 100644 --- a/lockscreen/BackgroundSettings.cpp +++ b/lockscreen/BackgroundSettings.cpp @@ -24,6 +24,7 @@ #include "config.h" #include "LockScreenSettings.h" #include "unity-shared/GtkTexture.h" +#include "unity-shared/PanelStyle.h" namespace unity { @@ -52,7 +53,7 @@ BaseTexturePtr BackgroundSettings::GetBackgroundTexture(nux::Size const& size, if (draw_logo) { int grid_x_offset = GetGridOffset(size.width); - int grid_y_offset = GetGridOffset(size.height); + int grid_y_offset = GetGridOffset(size.height) + panel::Style::Instance().panel_height(); cairo_save(c); @@ -73,7 +74,7 @@ BaseTexturePtr BackgroundSettings::GetBackgroundTexture(nux::Size const& size, int width = size.width; int height = size.height; int grid_x_offset = GetGridOffset(width); - int grid_y_offset = GetGridOffset(height); + int grid_y_offset = GetGridOffset(height) + panel::Style::Instance().panel_height(); // overlay grid cairo_surface_t* overlay_surface = cairo_surface_create_similar(cairo_surface, diff --git a/lockscreen/LockScreenShield.cpp b/lockscreen/LockScreenShield.cpp index 5bae584c3..59268409b 100644 --- a/lockscreen/LockScreenShield.cpp +++ b/lockscreen/LockScreenShield.cpp @@ -104,6 +104,7 @@ nux::View* Shield::CreatePanel() panel::PanelView* panel_view = new panel::PanelView(this, menu_manager, /*lockscreen_mode*/ true); panel_view->SetMaximumHeight(panel::Style::Instance().panel_height); + panel_view->SetOpacity(0.5); return panel_view; } diff --git a/panel/PanelView.cpp b/panel/PanelView.cpp index 8db6075ab..52ebb87ef 100644 --- a/panel/PanelView.cpp +++ b/panel/PanelView.cpp @@ -261,7 +261,7 @@ PanelView::Draw(nux::GraphicsEngine& GfxContext, bool force_draw) { bg_blur_texture_ = bg_effect_helper_.GetBlurRegion(); } - else + else if(!lockscreen_mode_) { bg_blur_texture_ = bg_effect_helper_.GetRegion(); } |