diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2014-02-14 05:57:01 +0100 |
|---|---|---|
| committer | Andrea Azzarone <azzaronea@gmail.com> | 2014-02-14 05:57:01 +0100 |
| commit | d1210db65f832e29d5606d59045e473abc6bdb80 (patch) | |
| tree | d7bd61873e5750f85ef136fc4770f34d95766702 /lockscreen | |
| parent | 065a9ca63d493b7e40724385749f75dde3788972 (diff) | |
Use 0.5 opacity for the panel in the lockscreen.
(bzr r3611.4.54)
Diffstat (limited to 'lockscreen')
| -rw-r--r-- | lockscreen/BackgroundSettings.cpp | 5 | ||||
| -rw-r--r-- | lockscreen/LockScreenShield.cpp | 1 |
2 files changed, 4 insertions, 2 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; } |
