| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" | 5 #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/shelf_constants.h" | 7 #include "ash/common/shelf/shelf_constants.h" |
| 8 #include "ash/common/shelf/wm_shelf_util.h" | 8 #include "ash/common/shelf/wm_shelf_util.h" |
| 9 #include "ash/keyboard/keyboard_ui.h" | 9 #include "ash/keyboard/keyboard_ui.h" |
| 10 #include "ash/shelf/shelf.h" | 10 #include "ash/shelf/shelf.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 views::CustomButton::STATE_NORMAL); | 56 views::CustomButton::STATE_NORMAL); |
| 57 int top_padding = (kTrayBarButtonWidth - image.height()) / 2; | 57 int top_padding = (kTrayBarButtonWidth - image.height()) / 2; |
| 58 int left_padding = (kTrayBarButtonWidth - image.width()) / 2; | 58 int left_padding = (kTrayBarButtonWidth - image.width()) / 2; |
| 59 int bottom_padding = kTrayBarButtonWidth - image.height() - top_padding; | 59 int bottom_padding = kTrayBarButtonWidth - image.height() - top_padding; |
| 60 int right_padding = kTrayBarButtonWidth - image.width() - left_padding; | 60 int right_padding = kTrayBarButtonWidth - image.width() - left_padding; |
| 61 | 61 |
| 62 // Square up the padding if horizontally aligned. Avoid extra padding when | 62 // Square up the padding if horizontally aligned. Avoid extra padding when |
| 63 // vertically aligned as the button would violate the width constraint on the | 63 // vertically aligned as the button would violate the width constraint on the |
| 64 // shelf. | 64 // shelf. |
| 65 if (IsHorizontalAlignment(alignment)) { | 65 if (IsHorizontalAlignment(alignment)) { |
| 66 gfx::Insets insets = button_->GetInsets(); | |
| 67 int additional_padding = std::max(0, top_padding - left_padding); | 66 int additional_padding = std::max(0, top_padding - left_padding); |
| 68 left_padding += additional_padding; | 67 left_padding += additional_padding; |
| 69 right_padding += additional_padding; | 68 right_padding += additional_padding; |
| 70 } | 69 } |
| 71 | 70 |
| 72 button_->SetBorder(views::Border::CreateEmptyBorder( | 71 button_->SetBorder(views::Border::CreateEmptyBorder( |
| 73 top_padding, | 72 top_padding, |
| 74 left_padding, | 73 left_padding, |
| 75 bottom_padding, | 74 bottom_padding, |
| 76 right_padding)); | 75 right_padding)); |
| (...skipping 19 matching lines...) Expand all Loading... |
| 96 const ui::Event& event) { | 95 const ui::Event& event) { |
| 97 DCHECK_EQ(button_, sender); | 96 DCHECK_EQ(button_, sender); |
| 98 PerformAction(event); | 97 PerformAction(event); |
| 99 } | 98 } |
| 100 | 99 |
| 101 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) { | 100 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) { |
| 102 SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled()); | 101 SetVisible(Shell::GetInstance()->keyboard_ui()->IsEnabled()); |
| 103 } | 102 } |
| 104 | 103 |
| 105 } // namespace ash | 104 } // namespace ash |
| OLD | NEW |