Fixed positions of label and border windows to avoid flickering on initial sh...

chrome/browser/chromeos/login/user_controller.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/user_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 205 matching lines @@
   image_window_ = CreateImageWindow(index);
   CreateBorderWindow(index, total_user_count, controls_height);
   label_window_ = CreateLabelWindow(index, WM_IPC_WINDOW_LOGIN_LABEL);
   unselected_label_window_ =
       CreateLabelWindow(index, WM_IPC_WINDOW_LOGIN_UNSELECTED_LABEL);
 }
 
 void UserController::SetPasswordEnabled(bool enable) {
   DCHECK(!is_guest_);
   password_field_->SetEnabled(enable);
-  submit_button_->SetEnabled(enable);
+//  submit_button_->SetEnabled(enable);

[Dmitry Polukhin, 2010/06/30 08:57:05]

Why is it here?

[whywhat, 2010/06/30 09:00:14]

Forgot to uncomment. Done.

   enable ? user_view_->StopThrobber() : user_view_->StartThrobber();
 }
 
 void UserController::ClearAndEnablePassword() {
   if (is_guest_) {
     new_user_view_->ClearAndEnablePassword();
   } else {
     password_field_->SetText(string16());
     SetPasswordEnabled(true);
     FocusPasswordField();
@@ skipping 100 matching lines @@
     layout->StartRow(0, 0);
     layout->AddView(password_field_);
     layout->AddView(submit_button_);
   }
 
   WidgetGtk* window = new WidgetGtk(WidgetGtk::TYPE_WINDOW);
   window->MakeTransparent();
   window->Init(NULL, gfx::Rect());
   window->SetContentsView(control_view);
   window->SetWidgetDelegate(this);
-  *height = is_guest_ ? kUserImageSize + kControlsHeight
-                      : control_view->GetPreferredSize().height();
   std::vector<int> params;
   params.push_back(index);
   WmIpc::instance()->SetWindowType(
       window->GetNativeView(),
       WM_IPC_WINDOW_LOGIN_CONTROLS,
       &params);
+  *height = is_guest_ ? kUserImageSize + kControlsHeight
+                      : control_view->GetPreferredSize().height();
   window->SetBounds(gfx::Rect(0, 0, kUserImageSize, *height));
   window->Show();
   return window;
 }
 
 WidgetGtk* UserController::CreateImageWindow(int index) {
   user_view_ = new UserView(this, true);
 
   if (!is_guest_) {
     user_view_->SetImage(user_.image());
@@ skipping 12 matching lines @@
       window->GetNativeView(),
       WM_IPC_WINDOW_LOGIN_IMAGE,
       &params);
   window->Show();
   return window;
 }
 
 void UserController::CreateBorderWindow(int index,
                                         int total_user_count,
                                         int controls_height) {
+  // Guest login controls window is much higher than exsisting user's controls
+  // window so window manager will place the control instead of image window.
+  int width = kUserImageSize + kBorderSize * 2;
+  int height = kBorderSize * 2 + controls_height;
+  if (!is_guest_)
+    height += kBorderSize + kUserImageSize;
   border_window_ = new WidgetGtk(WidgetGtk::TYPE_WINDOW);
-  border_window_->Init(NULL, gfx::Rect());
+  border_window_->Init(NULL, gfx::Rect(0, 0, width, height));
   border_window_->GetRootView()->set_background(
       views::Background::CreateSolidBackground(kBackgroundColor));
   UpdateUserCount(index, total_user_count);
 
-  // Guest login controls window is much higher than exsisting user's controls
-  // window so window manager will place the control instead of image window.
-  int height = kBorderSize * 2 + controls_height;
-  height += is_guest_ ? 0 : kBorderSize + kUserImageSize;
-  border_window_->SetBounds(gfx::Rect(0, 0, kUserImageSize + kBorderSize * 2,
-                            height));
   border_window_->Show();
 }
 
 void UserController::UpdateUserCount(int index, int total_user_count) {
   user_index_ = index;
   std::vector<int> params;
   params.push_back(index);
   params.push_back(total_user_count);
   params.push_back(kUnselectedSize);
   params.push_back(kPadding);
   WmIpc::instance()->SetWindowType(
       border_window_->GetNativeView(),
       WM_IPC_WINDOW_LOGIN_BORDER,
       &params);
 }
 
 WidgetGtk* UserController::CreateLabelWindow(int index,
                                              WmIpcWindowType type) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& font = (type == WM_IPC_WINDOW_LOGIN_LABEL) ?
       rb.GetFont(ResourceBundle::LargeFont).DeriveFont(0, gfx::Font::BOLD) :
       rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, gfx::Font::BOLD);
-  int width = (type == WM_IPC_WINDOW_LOGIN_LABEL) ?
-      kUserImageSize : kUnselectedSize;
-  WidgetGtk* window = new ClickNotifyingWidget(WidgetGtk::TYPE_WINDOW, this);
-  window->MakeTransparent();
-  window->Init(NULL, gfx::Rect());
   std::wstring text = is_guest_ ? l10n_util::GetString(IDS_GUEST) :
       UTF8ToWide(user_.GetDisplayName());
   views::Label* label = new views::Label(text);
   label->SetColor(kTextColor);
   label->SetFont(font);
   if (type == WM_IPC_WINDOW_LOGIN_LABEL)
     label_view_ = label;
   else
     unselected_label_view_ = label;
 
+  int width = (type == WM_IPC_WINDOW_LOGIN_LABEL) ?
+      kUserImageSize : kUnselectedSize;
+  int height = label->GetPreferredSize().height();
+  WidgetGtk* window = new ClickNotifyingWidget(WidgetGtk::TYPE_WINDOW, this);
+  window->MakeTransparent();
+  window->Init(NULL, gfx::Rect(0, 0, width, height));
   window->SetContentsView(label);
 
-  int height = label->GetPreferredSize().height();
   std::vector<int> params;
   params.push_back(index);
   WmIpc::instance()->SetWindowType(window->GetNativeView(), type, &params);
-  window->SetBounds(gfx::Rect(0, 0, width, height));
   window->Show();
   return window;
 }
 
 gfx::Rect UserController::GetScreenBounds() const {
   if (is_guest_) {
     return new_user_view_->GetPasswordBounds();
   } else {
     gfx::Rect screen_bounds(password_field_->bounds());
     gfx::Point origin(screen_bounds.origin());
@@ skipping 31 matching lines @@
 
 void UserController::SelectUser(int index) {
   delegate_->SelectUser(index);
 }
 
 void UserController::FocusPasswordField() {
   password_field_->RequestFocus();
 }
 
 }  // namespace chromeos