Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(848)

Unified Diff: snapshot_window.cc

Issue 2867041: This fixes a problem with fav icon opacity, and initial panning position. (Closed) Base URL: ssh://git@chromiumos-git//window_manager.git
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « layout_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: snapshot_window.cc
diff --git a/snapshot_window.cc b/snapshot_window.cc
index a2cbcb4cfd487721fe074d289e1af865b6f70570..ea4774c5dcbfbcf9cd153b7871a2a602c51aa21c 100644
--- a/snapshot_window.cc
+++ b/snapshot_window.cc
@@ -235,6 +235,7 @@ void LayoutManager::SnapshotWindow::ConfigureForActiveMode(bool animate) {
win_->actor()->SetTilt(0.0, anim_ms);
win_->MoveComposited(layout_manager_->x(), layout_manager_->y(), anim_ms);
if (fav_icon_) {
+ fav_icon_->SetCompositedOpacity(1.0f, 0);
fav_icon_->MoveComposited(layout_manager_->x(),
kTitlePadding + layout_manager_->y() +
win_->client_height() * snapshot_scale_y,
@@ -291,6 +292,7 @@ void LayoutManager::SnapshotWindow::ConfigureForOverviewMode(bool animate) {
win_->MoveComposited(layout_manager_->x(), layout_manager_->y(), 0);
if (state_ == STATE_OVERVIEW_MODE_SELECTED) {
if (fav_icon_) {
+ fav_icon_->SetCompositedOpacity(1.0f, 0);
fav_icon_->MoveComposited(layout_manager_->x(),
kTitlePadding + layout_manager_->y() +
win_->client_height() * snapshot_scale_y, 0);
@@ -356,8 +358,10 @@ void LayoutManager::SnapshotWindow::ConfigureForOverviewMode(bool animate) {
int title_y = kTitlePadding + absolute_overview_y +
win_->client_height() * overview_scale_;
- if (fav_icon_)
+ if (fav_icon_) {
+ fav_icon_->SetCompositedOpacity(1.0f, opacity_anim_ms);
fav_icon_->MoveComposited(absolute_overview_x, title_y, anim_ms);
+ }
if (title_) {
if (state_ == STATE_OVERVIEW_MODE_SELECTED) {
« no previous file with comments | « layout_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698