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

Side by Side Diff: ui/gfx/render_text.h

Issue 119813002: Implement eliding/truncating at end in RenderText (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments from msw #2 Created 6 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 #ifndef UI_GFX_RENDER_TEXT_H_ 5 #ifndef UI_GFX_RENDER_TEXT_H_
6 #define UI_GFX_RENDER_TEXT_H_ 6 #define UI_GFX_RENDER_TEXT_H_
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <cstring> 9 #include <cstring>
10 #include <string> 10 #include <string>
11 #include <utility> 11 #include <utility>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
15 #include "base/i18n/rtl.h" 15 #include "base/i18n/rtl.h"
16 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
17 #include "skia/ext/refptr.h" 17 #include "skia/ext/refptr.h"
18 #include "third_party/skia/include/core/SkColor.h" 18 #include "third_party/skia/include/core/SkColor.h"
19 #include "third_party/skia/include/core/SkPaint.h" 19 #include "third_party/skia/include/core/SkPaint.h"
20 #include "third_party/skia/include/core/SkRect.h" 20 #include "third_party/skia/include/core/SkRect.h"
21 #include "ui/gfx/break_list.h" 21 #include "ui/gfx/break_list.h"
22 #include "ui/gfx/font_list.h" 22 #include "ui/gfx/font_list.h"
23 #include "ui/gfx/point.h" 23 #include "ui/gfx/point.h"
24 #include "ui/gfx/range/range.h" 24 #include "ui/gfx/range/range.h"
25 #include "ui/gfx/rect.h" 25 #include "ui/gfx/rect.h"
26 #include "ui/gfx/selection_model.h" 26 #include "ui/gfx/selection_model.h"
27 #include "ui/gfx/shadow_value.h" 27 #include "ui/gfx/shadow_value.h"
28 #include "ui/gfx/size_f.h" 28 #include "ui/gfx/size_f.h"
29 #include "ui/gfx/text_constants.h" 29 #include "ui/gfx/text_constants.h"
30 #include "ui/gfx/text_elider.h"
30 #include "ui/gfx/vector2d.h" 31 #include "ui/gfx/vector2d.h"
31 32
32 class SkCanvas; 33 class SkCanvas;
33 class SkDrawLooper; 34 class SkDrawLooper;
34 struct SkPoint; 35 struct SkPoint;
35 class SkShader; 36 class SkShader;
36 class SkTypeface; 37 class SkTypeface;
37 38
38 namespace gfx { 39 namespace gfx {
39 40
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 // Windows. Support other platforms. 222 // Windows. Support other platforms.
222 bool multiline() const { return multiline_; } 223 bool multiline() const { return multiline_; }
223 void SetMultiline(bool multiline); 224 void SetMultiline(bool multiline);
224 225
225 // Set the maximum length of the displayed layout text, not the actual text. 226 // Set the maximum length of the displayed layout text, not the actual text.
226 // A |length| of 0 forgoes a hard limit, but does not guarantee proper 227 // A |length| of 0 forgoes a hard limit, but does not guarantee proper
227 // functionality of very long strings. Applies to subsequent SetText calls. 228 // functionality of very long strings. Applies to subsequent SetText calls.
228 // WARNING: Only use this for system limits, it lacks complex text support. 229 // WARNING: Only use this for system limits, it lacks complex text support.
229 void set_truncate_length(size_t length) { truncate_length_ = length; } 230 void set_truncate_length(size_t length) { truncate_length_ = length; }
230 231
232 // Elides the text to fit in |display_rect| according to the specified
233 // |elide_behavior|. |ELIDE_IN_MIDDLE| is not supported. If both truncate
234 // and elide are specified, the shorter of the two will be applicable.
235 void SetElideBehavior(ElideBehavior elide_behavior);
236
231 const Rect& display_rect() const { return display_rect_; } 237 const Rect& display_rect() const { return display_rect_; }
232 void SetDisplayRect(const Rect& r); 238 void SetDisplayRect(const Rect& r);
233 239
234 void set_fade_head(bool fade_head) { fade_head_ = fade_head; } 240 void set_fade_head(bool fade_head) { fade_head_ = fade_head; }
235 bool fade_head() const { return fade_head_; } 241 bool fade_head() const { return fade_head_; }
236 void set_fade_tail(bool fade_tail) { fade_tail_ = fade_tail; } 242 void set_fade_tail(bool fade_tail) { fade_tail_ = fade_tail; }
237 bool fade_tail() const { return fade_tail_; } 243 bool fade_tail() const { return fade_tail_; }
238 244
239 bool background_is_transparent() const { return background_is_transparent_; } 245 bool background_is_transparent() const { return background_is_transparent_; }
240 void set_background_is_transparent(bool transparent) { 246 void set_background_is_transparent(bool transparent) {
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 size_t caret_pos, 535 size_t caret_pos,
530 LogicalCursorDirection caret_affinity); 536 LogicalCursorDirection caret_affinity);
531 537
532 private: 538 private:
533 friend class RenderTextTest; 539 friend class RenderTextTest;
534 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, DefaultStyle); 540 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, DefaultStyle);
535 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, SetColorAndStyle); 541 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, SetColorAndStyle);
536 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ApplyColorAndStyle); 542 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ApplyColorAndStyle);
537 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ObscuredText); 543 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ObscuredText);
538 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, RevealObscuredText); 544 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, RevealObscuredText);
545 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedText);
546 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, ElidedObscuredText);
539 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedText); 547 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedText);
540 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedObscuredText); 548 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, TruncatedObscuredText);
541 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions); 549 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GraphemePositions);
542 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels); 550 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, EdgeSelectionModels);
543 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset); 551 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffset);
544 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL); 552 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, GetTextOffsetHorizontalDefaultInRTL);
545 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth); 553 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_MinWidth);
546 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth); 554 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_NormalWidth);
547 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth); 555 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_SufficientWidth);
548 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline); 556 FRIEND_TEST_ALL_PREFIXES(RenderTextTest, Multiline_Newline);
549 557
550 // Set the cursor to |position|, with the caret trailing the previous 558 // Set the cursor to |position|, with the caret trailing the previous
551 // grapheme, or if there is no previous grapheme, leading the cursor position. 559 // grapheme, or if there is no previous grapheme, leading the cursor position.
552 // If |select| is false, the selection start is moved to the same position. 560 // If |select| is false, the selection start is moved to the same position.
553 // If the |position| is not a cursorable position (not on grapheme boundary), 561 // If the |position| is not a cursorable position (not on grapheme boundary),
554 // it is a NO-OP. 562 // it is a NO-OP.
555 void MoveCursorTo(size_t position, bool select); 563 void MoveCursorTo(size_t position, bool select);
556 564
557 // Updates |layout_text_| if the text is obscured or truncated. 565 // Updates |layout_text_| if the text is obscured or truncated.
558 void UpdateLayoutText(); 566 void UpdateLayoutText();
559 567
568 // Elides |text| to fit in the |display_rect_| with given |elide_behavior_|.
569 // See ElideText in ui/gfx/text_elider.cc for reference.
570 base::string16 ElideText(const base::string16& text);
571
560 // Update the cached bounds and display offset to ensure that the current 572 // Update the cached bounds and display offset to ensure that the current
561 // cursor is within the visible display area. 573 // cursor is within the visible display area.
562 void UpdateCachedBoundsAndOffset(); 574 void UpdateCachedBoundsAndOffset();
563 575
564 // Draw the selection. 576 // Draw the selection.
565 void DrawSelection(Canvas* canvas); 577 void DrawSelection(Canvas* canvas);
566 578
567 // Logical UTF-16 string data to be drawn. 579 // Logical UTF-16 string data to be drawn.
568 base::string16 text_; 580 base::string16 text_;
569 581
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
622 bool composition_and_selection_styles_applied_; 634 bool composition_and_selection_styles_applied_;
623 635
624 // A flag to obscure actual text with asterisks for password fields. 636 // A flag to obscure actual text with asterisks for password fields.
625 bool obscured_; 637 bool obscured_;
626 // The index at which the char should be revealed in the obscured text. 638 // The index at which the char should be revealed in the obscured text.
627 int obscured_reveal_index_; 639 int obscured_reveal_index_;
628 640
629 // The maximum length of text to display, 0 forgoes a hard limit. 641 // The maximum length of text to display, 0 forgoes a hard limit.
630 size_t truncate_length_; 642 size_t truncate_length_;
631 643
644 // The behavior for eliding or truncating.
645 ElideBehavior elide_behavior_;
646
632 // The obscured and/or truncated text that will be displayed. 647 // The obscured and/or truncated text that will be displayed.
633 base::string16 layout_text_; 648 base::string16 layout_text_;
634 649
635 // Whether the text should be broken into multiple lines. Uses the width of 650 // Whether the text should be broken into multiple lines. Uses the width of
636 // |display_rect_| as the width cap. 651 // |display_rect_| as the width cap.
637 bool multiline_; 652 bool multiline_;
638 653
639 // Fade text head and/or tail, if text doesn't fit into |display_rect_|. 654 // Fade text head and/or tail, if text doesn't fit into |display_rect_|.
640 bool fade_head_; 655 bool fade_head_;
641 bool fade_tail_; 656 bool fade_tail_;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
674 // Lines computed by EnsureLayout. These should be invalidated with 689 // Lines computed by EnsureLayout. These should be invalidated with
675 // ResetLayout and on |display_rect_| changes. 690 // ResetLayout and on |display_rect_| changes.
676 std::vector<internal::Line> lines_; 691 std::vector<internal::Line> lines_;
677 692
678 DISALLOW_COPY_AND_ASSIGN(RenderText); 693 DISALLOW_COPY_AND_ASSIGN(RenderText);
679 }; 694 };
680 695
681 } // namespace gfx 696 } // namespace gfx
682 697
683 #endif // UI_GFX_RENDER_TEXT_H_ 698 #endif // UI_GFX_RENDER_TEXT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698