| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/views/controls/tree/tree_view.h" | 5 #include "ui/views/controls/tree/tree_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 int width = preferred_size_.width(); | 343 int width = preferred_size_.width(); |
| 344 int height = preferred_size_.height(); | 344 int height = preferred_size_.height(); |
| 345 if (parent()) { | 345 if (parent()) { |
| 346 width = std::max(parent()->width(), width); | 346 width = std::max(parent()->width(), width); |
| 347 height = std::max(parent()->height(), height); | 347 height = std::max(parent()->height(), height); |
| 348 } | 348 } |
| 349 SetBounds(x(), y(), width, height); | 349 SetBounds(x(), y(), width, height); |
| 350 LayoutEditor(); | 350 LayoutEditor(); |
| 351 } | 351 } |
| 352 | 352 |
| 353 gfx::Size TreeView::GetPreferredSize() { | 353 gfx::Size TreeView::GetPreferredSize() const { |
| 354 return preferred_size_; | 354 return preferred_size_; |
| 355 } | 355 } |
| 356 | 356 |
| 357 bool TreeView::AcceleratorPressed(const ui::Accelerator& accelerator) { | 357 bool TreeView::AcceleratorPressed(const ui::Accelerator& accelerator) { |
| 358 if (accelerator.key_code() == ui::VKEY_RETURN) { | 358 if (accelerator.key_code() == ui::VKEY_RETURN) { |
| 359 CommitEdit(); | 359 CommitEdit(); |
| 360 } else { | 360 } else { |
| 361 DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code()); | 361 DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code()); |
| 362 CancelEdit(); | 362 CancelEdit(); |
| 363 RequestFocus(); | 363 RequestFocus(); |
| (...skipping 671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1035 if (!is_expanded_) | 1035 if (!is_expanded_) |
| 1036 return max_width; | 1036 return max_width; |
| 1037 for (int i = 0; i < child_count(); ++i) { | 1037 for (int i = 0; i < child_count(); ++i) { |
| 1038 max_width = std::max(max_width, | 1038 max_width = std::max(max_width, |
| 1039 GetChild(i)->GetMaxWidth(indent, depth + 1)); | 1039 GetChild(i)->GetMaxWidth(indent, depth + 1)); |
| 1040 } | 1040 } |
| 1041 return max_width; | 1041 return max_width; |
| 1042 } | 1042 } |
| 1043 | 1043 |
| 1044 } // namespace views | 1044 } // namespace views |
| OLD | NEW |