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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/views/controls/label_unittest.cc

Issue 843503003: Cache DrawStringParams in views::Label (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sky's comments addressed Created 5 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
« ui/views/controls/label.cc ('K') | « ui/views/controls/label.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "ui/views/controls/label.h" 5 #include "ui/views/controls/label.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/accessibility/ax_view_state.h" 10 #include "ui/accessibility/ax_view_state.h"
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 gfx::Size required_size_with_border = label.GetPreferredSize(); 353 gfx::Size required_size_with_border = label.GetPreferredSize();
354 EXPECT_EQ(required_size_with_border.height(), 354 EXPECT_EQ(required_size_with_border.height(),
355 required_size.height() + border.height()); 355 required_size.height() + border.height());
356 EXPECT_EQ(required_size_with_border.width(), 356 EXPECT_EQ(required_size_with_border.width(),
357 required_size.width() + border.width()); 357 required_size.width() + border.width());
358 } 358 }
359 359
360 TEST_F(LabelTest, DirectionalityFromText) { 360 TEST_F(LabelTest, DirectionalityFromText) {
361 Label label; 361 Label label;
362 label.SetBounds(0, 0, 1000, 1000); 362 label.SetBounds(0, 0, 1000, 1000);
363 base::string16 paint_text;
364 gfx::Rect text_bounds;
365 int flags = -1;
366 363
367 // Test text starts with RTL character. 364 // Test text starts with RTL character.
368 label.SetText(base::WideToUTF16(L" \x5d0\x5d1\x5d2 abc")); 365 label.SetText(base::WideToUTF16(L" \x5d0\x5d1\x5d2 abc"));
369 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 366 const Label::DrawStringParams* params = label.CalculateDrawStringParams();
370 EXPECT_EQ(gfx::Canvas::FORCE_RTL_DIRECTIONALITY, 367 EXPECT_EQ(gfx::Canvas::FORCE_RTL_DIRECTIONALITY,
371 flags & (gfx::Canvas::FORCE_RTL_DIRECTIONALITY | 368 params->flags & (gfx::Canvas::FORCE_RTL_DIRECTIONALITY |
372 gfx::Canvas::FORCE_LTR_DIRECTIONALITY)); 369 gfx::Canvas::FORCE_LTR_DIRECTIONALITY));
373 370
374 // Test text starts with LTR character. 371 // Test text starts with LTR character.
375 label.SetText(base::WideToUTF16(L"ltr \x5d0\x5d1\x5d2 abc")); 372 label.SetText(base::WideToUTF16(L"ltr \x5d0\x5d1\x5d2 abc"));
376 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 373 params = label.CalculateDrawStringParams();
377 EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY, 374 EXPECT_EQ(gfx::Canvas::FORCE_LTR_DIRECTIONALITY,
378 flags & (gfx::Canvas::FORCE_RTL_DIRECTIONALITY | 375 params->flags & (gfx::Canvas::FORCE_RTL_DIRECTIONALITY |
379 gfx::Canvas::FORCE_LTR_DIRECTIONALITY)); 376 gfx::Canvas::FORCE_LTR_DIRECTIONALITY));
380 } 377 }
381 378
382 TEST_F(LabelTest, DrawSingleLineString) { 379 TEST_F(LabelTest, DrawSingleLineString) {
383 Label label; 380 Label label;
384 label.SetFocusable(false); 381 label.SetFocusable(false);
385 382
386 label.SetText(ASCIIToUTF16("Here's a string with no returns.")); 383 label.SetText(ASCIIToUTF16("Here's a string with no returns."));
387 gfx::Size required_size(label.GetPreferredSize()); 384 gfx::Size required_size(label.GetPreferredSize());
388 gfx::Size extra(22, 8); 385 gfx::Size extra(22, 8);
389 label.SetBounds(0, 0, required_size.width() + extra.width(), 386 label.SetBounds(0, 0, required_size.width() + extra.width(),
390 required_size.height() + extra.height()); 387 required_size.height() + extra.height());
391 388
392 // Do some basic verifications for all three alignments. 389 // Do some basic verifications for all three alignments.
393 base::string16 paint_text;
394 gfx::Rect text_bounds;
395 int flags = -1;
396
397 // Centered text. 390 // Centered text.
398 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 391 const Label::DrawStringParams* params = label.CalculateDrawStringParams();
399 EXPECT_EQ(label.text(), paint_text); 392 EXPECT_EQ(label.text(), params->text);
400 // The text should be centered horizontally and vertically. 393 // The text should be centered horizontally and vertically.
401 EXPECT_EQ(extra.width() / 2, text_bounds.x()); 394 EXPECT_EQ(extra.width() / 2, params->bounds.x());
402 EXPECT_EQ(0, text_bounds.y()); 395 EXPECT_EQ(0, params->bounds.y());
403 EXPECT_EQ(required_size.width(), text_bounds.width()); 396 EXPECT_EQ(required_size.width(), params->bounds.width());
404 EXPECT_EQ(label.height(), text_bounds.height()); 397 EXPECT_EQ(label.height(), params->bounds.height());
405 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER, 398 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
406 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 399 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
407 gfx::Canvas::TEXT_ALIGN_CENTER | 400 gfx::Canvas::TEXT_ALIGN_CENTER |
408 gfx::Canvas::TEXT_ALIGN_RIGHT)); 401 gfx::Canvas::TEXT_ALIGN_RIGHT));
409 402
410 // Left aligned text. 403 // Left aligned text.
411 label.SetHorizontalAlignment(gfx::ALIGN_LEFT); 404 label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
412 paint_text.clear(); 405 label.ResetLayoutCache();
413 text_bounds.SetRect(0, 0, 0, 0); 406 params = label.CalculateDrawStringParams();
414 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 407 EXPECT_EQ(label.text(), params->text);
415 EXPECT_EQ(label.text(), paint_text);
416 // The text should be left aligned horizontally and centered vertically. 408 // The text should be left aligned horizontally and centered vertically.
417 EXPECT_EQ(0, text_bounds.x()); 409 EXPECT_EQ(0, params->bounds.x());
418 EXPECT_EQ(0, text_bounds.y()); 410 EXPECT_EQ(0, params->bounds.y());
419 EXPECT_EQ(required_size.width(), text_bounds.width()); 411 EXPECT_EQ(required_size.width(), params->bounds.width());
420 EXPECT_EQ(label.height(), text_bounds.height()); 412 EXPECT_EQ(label.height(), params->bounds.height());
421 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT, 413 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
422 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 414 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
423 gfx::Canvas::TEXT_ALIGN_CENTER | 415 gfx::Canvas::TEXT_ALIGN_CENTER |
424 gfx::Canvas::TEXT_ALIGN_RIGHT)); 416 gfx::Canvas::TEXT_ALIGN_RIGHT));
425 417
426 // Right aligned text. 418 // Right aligned text.
427 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT); 419 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
428 paint_text.clear(); 420 label.ResetLayoutCache();
429 text_bounds.SetRect(0, 0, 0, 0); 421 params = label.CalculateDrawStringParams();
430 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 422 EXPECT_EQ(label.text(), params->text);
431 EXPECT_EQ(label.text(), paint_text);
432 // The text should be right aligned horizontally and centered vertically. 423 // The text should be right aligned horizontally and centered vertically.
433 EXPECT_EQ(extra.width(), text_bounds.x()); 424 EXPECT_EQ(extra.width(), params->bounds.x());
434 EXPECT_EQ(0, text_bounds.y()); 425 EXPECT_EQ(0, params->bounds.y());
435 EXPECT_EQ(required_size.width(), text_bounds.width()); 426 EXPECT_EQ(required_size.width(), params->bounds.width());
436 EXPECT_EQ(label.height(), text_bounds.height()); 427 EXPECT_EQ(label.height(), params->bounds.height());
437 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT, 428 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
438 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 429 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
439 gfx::Canvas::TEXT_ALIGN_CENTER | 430 gfx::Canvas::TEXT_ALIGN_CENTER |
440 gfx::Canvas::TEXT_ALIGN_RIGHT)); 431 gfx::Canvas::TEXT_ALIGN_RIGHT));
441 432
442 // Test single line drawing with a border. 433 // Test single line drawing with a border.
443 gfx::Insets border(39, 34, 8, 96); 434 gfx::Insets border(39, 34, 8, 96);
444 label.SetBorder(Border::CreateEmptyBorder( 435 label.SetBorder(Border::CreateEmptyBorder(
445 border.top(), border.left(), border.bottom(), border.right())); 436 border.top(), border.left(), border.bottom(), border.right()));
446 437
447 gfx::Size required_size_with_border(label.GetPreferredSize()); 438 gfx::Size required_size_with_border(label.GetPreferredSize());
448 EXPECT_EQ(required_size.width() + border.width(), 439 EXPECT_EQ(required_size.width() + border.width(),
449 required_size_with_border.width()); 440 required_size_with_border.width());
450 EXPECT_EQ(required_size.height() + border.height(), 441 EXPECT_EQ(required_size.height() + border.height(),
451 required_size_with_border.height()); 442 required_size_with_border.height());
452 label.SetBounds(0, 0, required_size_with_border.width() + extra.width(), 443 label.SetBounds(0, 0, required_size_with_border.width() + extra.width(),
453 required_size_with_border.height() + extra.height()); 444 required_size_with_border.height() + extra.height());
454 445
455 // Centered text with border. 446 // Centered text with border.
456 label.SetHorizontalAlignment(gfx::ALIGN_CENTER); 447 label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
457 paint_text.clear(); 448 label.ResetLayoutCache();
458 text_bounds.SetRect(0, 0, 0, 0); 449 params = label.CalculateDrawStringParams();
459 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 450 EXPECT_EQ(label.text(), params->text);
460 EXPECT_EQ(label.text(), paint_text);
461 // The text should be centered horizontally and vertically within the border. 451 // The text should be centered horizontally and vertically within the border.
462 EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x()); 452 EXPECT_EQ(border.left() + extra.width() / 2, params->bounds.x());
463 EXPECT_EQ(border.top(), text_bounds.y()); 453 EXPECT_EQ(border.top(), params->bounds.y());
464 EXPECT_EQ(required_size.width(), text_bounds.width()); 454 EXPECT_EQ(required_size.width(), params->bounds.width());
465 EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height()); 455 EXPECT_EQ(label.GetContentsBounds().height(), params->bounds.height());
466 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER, 456 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
467 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 457 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
468 gfx::Canvas::TEXT_ALIGN_CENTER | 458 gfx::Canvas::TEXT_ALIGN_CENTER |
469 gfx::Canvas::TEXT_ALIGN_RIGHT)); 459 gfx::Canvas::TEXT_ALIGN_RIGHT));
470 460
471 // Left aligned text with border. 461 // Left aligned text with border.
472 label.SetHorizontalAlignment(gfx::ALIGN_LEFT); 462 label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
473 paint_text.clear(); 463 label.ResetLayoutCache();
474 text_bounds.SetRect(0, 0, 0, 0); 464 params = label.CalculateDrawStringParams();
475 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 465 EXPECT_EQ(label.text(), params->text);
476 EXPECT_EQ(label.text(), paint_text);
477 // The text should be left aligned horizontally and centered vertically. 466 // The text should be left aligned horizontally and centered vertically.
478 EXPECT_EQ(border.left(), text_bounds.x()); 467 EXPECT_EQ(border.left(), params->bounds.x());
479 EXPECT_EQ(border.top(), text_bounds.y()); 468 EXPECT_EQ(border.top(), params->bounds.y());
480 EXPECT_EQ(required_size.width(), text_bounds.width()); 469 EXPECT_EQ(required_size.width(), params->bounds.width());
481 EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height()); 470 EXPECT_EQ(label.GetContentsBounds().height(), params->bounds.height());
482 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT, 471 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
483 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 472 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
484 gfx::Canvas::TEXT_ALIGN_CENTER | 473 gfx::Canvas::TEXT_ALIGN_CENTER |
485 gfx::Canvas::TEXT_ALIGN_RIGHT)); 474 gfx::Canvas::TEXT_ALIGN_RIGHT));
486 475
487 // Right aligned text. 476 // Right aligned text with border.
488 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT); 477 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
489 paint_text.clear(); 478 label.ResetLayoutCache();
490 text_bounds.SetRect(0, 0, 0, 0); 479 params = label.CalculateDrawStringParams();
491 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 480 EXPECT_EQ(label.text(), params->text);
492 EXPECT_EQ(label.text(), paint_text);
493 // The text should be right aligned horizontally and centered vertically. 481 // The text should be right aligned horizontally and centered vertically.
494 EXPECT_EQ(border.left() + extra.width(), text_bounds.x()); 482 EXPECT_EQ(border.left() + extra.width(), params->bounds.x());
495 EXPECT_EQ(border.top(), text_bounds.y()); 483 EXPECT_EQ(border.top(), params->bounds.y());
496 EXPECT_EQ(required_size.width(), text_bounds.width()); 484 EXPECT_EQ(required_size.width(), params->bounds.width());
497 EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height()); 485 EXPECT_EQ(label.GetContentsBounds().height(), params->bounds.height());
498 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT, 486 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
499 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 487 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
500 gfx::Canvas::TEXT_ALIGN_CENTER | 488 gfx::Canvas::TEXT_ALIGN_CENTER |
501 gfx::Canvas::TEXT_ALIGN_RIGHT)); 489 gfx::Canvas::TEXT_ALIGN_RIGHT));
502 } 490 }
503 491
504 // Pango needs a max height to elide multiline text; that is not supported here. 492 // Pango needs a max height to elide multiline text; that is not supported here.
505 TEST_F(LabelTest, DrawMultiLineString) { 493 TEST_F(LabelTest, DrawMultiLineString) {
506 Label label; 494 Label label;
507 label.SetFocusable(false); 495 label.SetFocusable(false);
508 // Set a background color to prevent gfx::Canvas::NO_SUBPIXEL_RENDERING flags. 496 // Set a background color to prevent gfx::Canvas::NO_SUBPIXEL_RENDERING flags.
509 label.SetBackgroundColor(SK_ColorWHITE); 497 label.SetBackgroundColor(SK_ColorWHITE);
510 498
511 label.SetText(ASCIIToUTF16("Another string\nwith returns\n\n!")); 499 label.SetText(ASCIIToUTF16("Another string\nwith returns\n\n!"));
512 label.SetMultiLine(true); 500 label.SetMultiLine(true);
513 label.SizeToFit(0); 501 label.SizeToFit(0);
514 gfx::Size extra(50, 10); 502 gfx::Size extra(50, 10);
515 label.SetBounds(label.x(), label.y(), 503 label.SetBounds(label.x(), label.y(),
516 label.width() + extra.width(), 504 label.width() + extra.width(),
517 label.height() + extra.height()); 505 label.height() + extra.height());
518 506
519 // Do some basic verifications for all three alignments. 507 // Do some basic verifications for all three alignments.
520 base::string16 paint_text; 508 const Label::DrawStringParams* params = label.CalculateDrawStringParams();
521 gfx::Rect text_bounds; 509 EXPECT_EQ(label.text(), params->text);
522 int flags = -1; 510 EXPECT_EQ(extra.width() / 2, params->bounds.x());
523 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 511 EXPECT_EQ(extra.height() / 2, params->bounds.y());
524 EXPECT_EQ(label.text(), paint_text); 512 EXPECT_GT(params->bounds.width(), kMinTextDimension);
525 EXPECT_EQ(extra.width() / 2, text_bounds.x()); 513 EXPECT_GT(params->bounds.height(), kMinTextDimension);
526 EXPECT_EQ(extra.height() / 2, text_bounds.y());
527 EXPECT_GT(text_bounds.width(), kMinTextDimension);
528 EXPECT_GT(text_bounds.height(), kMinTextDimension);
529 int expected_flags = gfx::Canvas::MULTI_LINE | 514 int expected_flags = gfx::Canvas::MULTI_LINE |
530 gfx::Canvas::TEXT_ALIGN_CENTER | 515 gfx::Canvas::TEXT_ALIGN_CENTER |
531 gfx::Canvas::FORCE_LTR_DIRECTIONALITY; 516 gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
532 #if !defined(OS_WIN) 517 #if !defined(OS_WIN)
533 expected_flags |= gfx::Canvas::NO_ELLIPSIS; 518 expected_flags |= gfx::Canvas::NO_ELLIPSIS;
534 #endif 519 #endif
535 EXPECT_EQ(expected_flags, expected_flags); 520 EXPECT_EQ(expected_flags, expected_flags);
536 gfx::Rect center_bounds(text_bounds); 521 gfx::Rect center_bounds(params->bounds);
537 522
538 label.SetHorizontalAlignment(gfx::ALIGN_LEFT); 523 label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
539 paint_text.clear(); 524 label.ResetLayoutCache();
540 text_bounds.SetRect(0, 0, 0, 0); 525 params = label.CalculateDrawStringParams();
541 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 526 EXPECT_EQ(label.text(), params->text);
542 EXPECT_EQ(label.text(), paint_text); 527 EXPECT_EQ(0, params->bounds.x());
543 EXPECT_EQ(0, text_bounds.x()); 528 EXPECT_EQ(extra.height() / 2, params->bounds.y());
544 EXPECT_EQ(extra.height() / 2, text_bounds.y()); 529 EXPECT_GT(params->bounds.width(), kMinTextDimension);
545 EXPECT_GT(text_bounds.width(), kMinTextDimension); 530 EXPECT_GT(params->bounds.height(), kMinTextDimension);
546 EXPECT_GT(text_bounds.height(), kMinTextDimension);
547 expected_flags = gfx::Canvas::MULTI_LINE | 531 expected_flags = gfx::Canvas::MULTI_LINE |
548 gfx::Canvas::TEXT_ALIGN_LEFT | 532 gfx::Canvas::TEXT_ALIGN_LEFT |
549 gfx::Canvas::FORCE_LTR_DIRECTIONALITY; 533 gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
550 #if !defined(OS_WIN) 534 #if !defined(OS_WIN)
551 expected_flags |= gfx::Canvas::NO_ELLIPSIS; 535 expected_flags |= gfx::Canvas::NO_ELLIPSIS;
552 #endif 536 #endif
553 EXPECT_EQ(expected_flags, expected_flags); 537 EXPECT_EQ(expected_flags, expected_flags);
554 538
555 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT); 539 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
556 paint_text.clear(); 540 label.ResetLayoutCache();
557 text_bounds.SetRect(0, 0, 0, 0); 541 params = label.CalculateDrawStringParams();
558 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 542 EXPECT_EQ(label.text(), params->text);
559 EXPECT_EQ(label.text(), paint_text); 543 EXPECT_EQ(extra.width(), params->bounds.x());
560 EXPECT_EQ(extra.width(), text_bounds.x()); 544 EXPECT_EQ(extra.height() / 2, params->bounds.y());
561 EXPECT_EQ(extra.height() / 2, text_bounds.y()); 545 EXPECT_GT(params->bounds.width(), kMinTextDimension);
562 EXPECT_GT(text_bounds.width(), kMinTextDimension); 546 EXPECT_GT(params->bounds.height(), kMinTextDimension);
563 EXPECT_GT(text_bounds.height(), kMinTextDimension);
564 expected_flags = gfx::Canvas::MULTI_LINE | 547 expected_flags = gfx::Canvas::MULTI_LINE |
565 gfx::Canvas::TEXT_ALIGN_RIGHT | 548 gfx::Canvas::TEXT_ALIGN_RIGHT |
566 gfx::Canvas::FORCE_LTR_DIRECTIONALITY; 549 gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
567 #if !defined(OS_WIN) 550 #if !defined(OS_WIN)
568 expected_flags |= gfx::Canvas::NO_ELLIPSIS; 551 expected_flags |= gfx::Canvas::NO_ELLIPSIS;
569 #endif 552 #endif
570 EXPECT_EQ(expected_flags, expected_flags); 553 EXPECT_EQ(expected_flags, expected_flags);
571 554
572 // Test multiline drawing with a border. 555 // Test multiline drawing with a border.
573 gfx::Insets border(19, 92, 23, 2); 556 gfx::Insets border(19, 92, 23, 2);
574 label.SetBorder(Border::CreateEmptyBorder( 557 label.SetBorder(Border::CreateEmptyBorder(
575 border.top(), border.left(), border.bottom(), border.right())); 558 border.top(), border.left(), border.bottom(), border.right()));
576 label.SizeToFit(0); 559 label.SizeToFit(0);
577 label.SetBounds(label.x(), label.y(), 560 label.SetBounds(label.x(), label.y(),
578 label.width() + extra.width(), 561 label.width() + extra.width(),
579 label.height() + extra.height()); 562 label.height() + extra.height());
580 563
581 label.SetHorizontalAlignment(gfx::ALIGN_CENTER); 564 label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
582 paint_text.clear(); 565 label.ResetLayoutCache();
583 text_bounds.SetRect(0, 0, 0, 0); 566 params = label.CalculateDrawStringParams();
584 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 567 EXPECT_EQ(label.text(), params->text);
585 EXPECT_EQ(label.text(), paint_text); 568 EXPECT_EQ(border.left() + extra.width() / 2, params->bounds.x());
586 EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x()); 569 EXPECT_EQ(border.top() + extra.height() / 2, params->bounds.y());
587 EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y()); 570 EXPECT_EQ(center_bounds.width(), params->bounds.width());
588 EXPECT_EQ(center_bounds.width(), text_bounds.width()); 571 EXPECT_EQ(center_bounds.height(), params->bounds.height());
589 EXPECT_EQ(center_bounds.height(), text_bounds.height());
590 expected_flags = gfx::Canvas::MULTI_LINE | 572 expected_flags = gfx::Canvas::MULTI_LINE |
591 gfx::Canvas::TEXT_ALIGN_CENTER | 573 gfx::Canvas::TEXT_ALIGN_CENTER |
592 gfx::Canvas::FORCE_LTR_DIRECTIONALITY; 574 gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
593 #if !defined(OS_WIN) 575 #if !defined(OS_WIN)
594 expected_flags |= gfx::Canvas::NO_ELLIPSIS; 576 expected_flags |= gfx::Canvas::NO_ELLIPSIS;
595 #endif 577 #endif
596 EXPECT_EQ(expected_flags, expected_flags); 578 EXPECT_EQ(expected_flags, expected_flags);
597 579
598 label.SetHorizontalAlignment(gfx::ALIGN_LEFT); 580 label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
599 paint_text.clear(); 581 label.ResetLayoutCache();
600 text_bounds.SetRect(0, 0, 0, 0); 582 params = label.CalculateDrawStringParams();
601 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 583 EXPECT_EQ(label.text(), params->text);
602 EXPECT_EQ(label.text(), paint_text); 584 EXPECT_EQ(border.left(), params->bounds.x());
603 EXPECT_EQ(border.left(), text_bounds.x()); 585 EXPECT_EQ(border.top() + extra.height() / 2, params->bounds.y());
604 EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y()); 586 EXPECT_EQ(center_bounds.width(), params->bounds.width());
605 EXPECT_EQ(center_bounds.width(), text_bounds.width()); 587 EXPECT_EQ(center_bounds.height(), params->bounds.height());
606 EXPECT_EQ(center_bounds.height(), text_bounds.height());
607 expected_flags = gfx::Canvas::MULTI_LINE | 588 expected_flags = gfx::Canvas::MULTI_LINE |
608 gfx::Canvas::TEXT_ALIGN_LEFT | 589 gfx::Canvas::TEXT_ALIGN_LEFT |
609 gfx::Canvas::FORCE_LTR_DIRECTIONALITY; 590 gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
610 #if !defined(OS_WIN) 591 #if !defined(OS_WIN)
611 expected_flags |= gfx::Canvas::NO_ELLIPSIS; 592 expected_flags |= gfx::Canvas::NO_ELLIPSIS;
612 #endif 593 #endif
613 EXPECT_EQ(expected_flags, expected_flags); 594 EXPECT_EQ(expected_flags, expected_flags);
614 595
615 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT); 596 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
616 paint_text.clear(); 597 label.ResetLayoutCache();
617 text_bounds.SetRect(0, 0, 0, 0); 598 params = label.CalculateDrawStringParams();
618 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 599 EXPECT_EQ(label.text(), params->text);
619 EXPECT_EQ(label.text(), paint_text); 600 EXPECT_EQ(extra.width() + border.left(), params->bounds.x());
620 EXPECT_EQ(extra.width() + border.left(), text_bounds.x()); 601 EXPECT_EQ(border.top() + extra.height() / 2, params->bounds.y());
621 EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y()); 602 EXPECT_EQ(center_bounds.width(), params->bounds.width());
622 EXPECT_EQ(center_bounds.width(), text_bounds.width()); 603 EXPECT_EQ(center_bounds.height(), params->bounds.height());
623 EXPECT_EQ(center_bounds.height(), text_bounds.height());
624 expected_flags = gfx::Canvas::MULTI_LINE | 604 expected_flags = gfx::Canvas::MULTI_LINE |
625 gfx::Canvas::TEXT_ALIGN_RIGHT | 605 gfx::Canvas::TEXT_ALIGN_RIGHT |
626 gfx::Canvas::FORCE_LTR_DIRECTIONALITY; 606 gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
627 #if !defined(OS_WIN) 607 #if !defined(OS_WIN)
628 expected_flags |= gfx::Canvas::NO_ELLIPSIS; 608 expected_flags |= gfx::Canvas::NO_ELLIPSIS;
629 #endif 609 #endif
630 EXPECT_EQ(expected_flags, expected_flags); 610 EXPECT_EQ(expected_flags, expected_flags);
631 } 611 }
632 612
633 TEST_F(LabelTest, DrawSingleLineStringInRTL) { 613 TEST_F(LabelTest, DrawSingleLineStringInRTL) {
634 Label label; 614 Label label;
635 label.SetFocusable(false); 615 label.SetFocusable(false);
636 616
637 std::string locale = l10n_util::GetApplicationLocale(""); 617 std::string locale = l10n_util::GetApplicationLocale("");
638 base::i18n::SetICUDefaultLocale("he"); 618 base::i18n::SetICUDefaultLocale("he");
639 619
640 label.SetText(ASCIIToUTF16("Here's a string with no returns.")); 620 label.SetText(ASCIIToUTF16("Here's a string with no returns."));
641 gfx::Size required_size(label.GetPreferredSize()); 621 gfx::Size required_size(label.GetPreferredSize());
642 gfx::Size extra(22, 8); 622 gfx::Size extra(22, 8);
643 label.SetBounds(0, 0, required_size.width() + extra.width(), 623 label.SetBounds(0, 0, required_size.width() + extra.width(),
644 required_size.height() + extra.height()); 624 required_size.height() + extra.height());
645 625
646 // Do some basic verifications for all three alignments. 626 // Do some basic verifications for all three alignments.
647 base::string16 paint_text;
648 gfx::Rect text_bounds;
649 int flags = -1;
650
651 // Centered text. 627 // Centered text.
652 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 628 const Label::DrawStringParams* params = label.CalculateDrawStringParams();
653 EXPECT_EQ(label.text(), paint_text); 629 EXPECT_EQ(label.text(), params->text);
654 // The text should be centered horizontally and vertically. 630 // The text should be centered horizontally and vertically.
655 EXPECT_EQ(extra.width() / 2, text_bounds.x()); 631 EXPECT_EQ(extra.width() / 2, params->bounds.x());
656 EXPECT_EQ(0, text_bounds.y()); 632 EXPECT_EQ(0, params->bounds.y());
657 EXPECT_EQ(required_size.width(), text_bounds.width()); 633 EXPECT_EQ(required_size.width(), params->bounds.width());
658 EXPECT_EQ(label.height(), text_bounds.height()); 634 EXPECT_EQ(label.height(), params->bounds.height());
659 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER, 635 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
660 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 636 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
661 gfx::Canvas::TEXT_ALIGN_CENTER | 637 gfx::Canvas::TEXT_ALIGN_CENTER |
662 gfx::Canvas::TEXT_ALIGN_RIGHT)); 638 gfx::Canvas::TEXT_ALIGN_RIGHT));
663 639
664 // ALIGN_LEFT label. 640 // ALIGN_LEFT label.
665 label.SetHorizontalAlignment(gfx::ALIGN_LEFT); 641 label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
666 paint_text.clear(); 642 label.ResetLayoutCache();
667 text_bounds.SetRect(0, 0, 0, 0); 643 params = label.CalculateDrawStringParams();
668 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 644 EXPECT_EQ(label.text(), params->text);
669 EXPECT_EQ(label.text(), paint_text);
670 // The text should be right aligned horizontally and centered vertically. 645 // The text should be right aligned horizontally and centered vertically.
671 EXPECT_EQ(extra.width(), text_bounds.x()); 646 EXPECT_EQ(extra.width(), params->bounds.x());
672 EXPECT_EQ(0, text_bounds.y()); 647 EXPECT_EQ(0, params->bounds.y());
673 EXPECT_EQ(required_size.width(), text_bounds.width()); 648 EXPECT_EQ(required_size.width(), params->bounds.width());
674 EXPECT_EQ(label.height(), text_bounds.height()); 649 EXPECT_EQ(label.height(), params->bounds.height());
675 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT, 650 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
676 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 651 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
677 gfx::Canvas::TEXT_ALIGN_CENTER | 652 gfx::Canvas::TEXT_ALIGN_CENTER |
678 gfx::Canvas::TEXT_ALIGN_RIGHT)); 653 gfx::Canvas::TEXT_ALIGN_RIGHT));
679 654
680 // ALIGN_RIGHT label. 655 // ALIGN_RIGHT label.
681 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT); 656 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
682 paint_text.clear(); 657 label.ResetLayoutCache();
683 text_bounds.SetRect(0, 0, 0, 0); 658 params = label.CalculateDrawStringParams();
684 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 659 EXPECT_EQ(label.text(), params->text);
685 EXPECT_EQ(label.text(), paint_text);
686 // The text should be left aligned horizontally and centered vertically. 660 // The text should be left aligned horizontally and centered vertically.
687 EXPECT_EQ(0, text_bounds.x()); 661 EXPECT_EQ(0, params->bounds.x());
688 EXPECT_EQ(0, text_bounds.y()); 662 EXPECT_EQ(0, params->bounds.y());
689 EXPECT_EQ(required_size.width(), text_bounds.width()); 663 EXPECT_EQ(required_size.width(), params->bounds.width());
690 EXPECT_EQ(label.height(), text_bounds.height()); 664 EXPECT_EQ(label.height(), params->bounds.height());
691 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT, 665 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
692 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 666 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
693 gfx::Canvas::TEXT_ALIGN_CENTER | 667 gfx::Canvas::TEXT_ALIGN_CENTER |
694 gfx::Canvas::TEXT_ALIGN_RIGHT)); 668 gfx::Canvas::TEXT_ALIGN_RIGHT));
695 669
696 670
697 // Test single line drawing with a border. 671 // Test single line drawing with a border.
698 gfx::Insets border(39, 34, 8, 96); 672 gfx::Insets border(39, 34, 8, 96);
699 label.SetBorder(Border::CreateEmptyBorder( 673 label.SetBorder(Border::CreateEmptyBorder(
700 border.top(), border.left(), border.bottom(), border.right())); 674 border.top(), border.left(), border.bottom(), border.right()));
701 675
702 gfx::Size required_size_with_border(label.GetPreferredSize()); 676 gfx::Size required_size_with_border(label.GetPreferredSize());
703 EXPECT_EQ(required_size.width() + border.width(), 677 EXPECT_EQ(required_size.width() + border.width(),
704 required_size_with_border.width()); 678 required_size_with_border.width());
705 EXPECT_EQ(required_size.height() + border.height(), 679 EXPECT_EQ(required_size.height() + border.height(),
706 required_size_with_border.height()); 680 required_size_with_border.height());
707 label.SetBounds(0, 0, required_size_with_border.width() + extra.width(), 681 label.SetBounds(0, 0, required_size_with_border.width() + extra.width(),
708 required_size_with_border.height() + extra.height()); 682 required_size_with_border.height() + extra.height());
709 683
710 // Centered text with border. 684 // Centered text with border.
711 label.SetHorizontalAlignment(gfx::ALIGN_CENTER); 685 label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
712 paint_text.clear(); 686 label.ResetLayoutCache();
713 text_bounds.SetRect(0, 0, 0, 0); 687 params = label.CalculateDrawStringParams();
714 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 688 EXPECT_EQ(label.text(), params->text);
715 EXPECT_EQ(label.text(), paint_text);
716 // The text should be centered horizontally and vertically within the border. 689 // The text should be centered horizontally and vertically within the border.
717 EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x()); 690 EXPECT_EQ(border.left() + extra.width() / 2, params->bounds.x());
718 EXPECT_EQ(border.top(), text_bounds.y()); 691 EXPECT_EQ(border.top(), params->bounds.y());
719 EXPECT_EQ(required_size.width(), text_bounds.width()); 692 EXPECT_EQ(required_size.width(), params->bounds.width());
720 EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height()); 693 EXPECT_EQ(label.GetContentsBounds().height(), params->bounds.height());
721 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER, 694 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_CENTER,
722 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 695 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
723 gfx::Canvas::TEXT_ALIGN_CENTER | 696 gfx::Canvas::TEXT_ALIGN_CENTER |
724 gfx::Canvas::TEXT_ALIGN_RIGHT)); 697 gfx::Canvas::TEXT_ALIGN_RIGHT));
725 698
726 // ALIGN_LEFT text with border. 699 // ALIGN_LEFT text with border.
727 label.SetHorizontalAlignment(gfx::ALIGN_LEFT); 700 label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
728 paint_text.clear(); 701 label.ResetLayoutCache();
729 text_bounds.SetRect(0, 0, 0, 0); 702 params = label.CalculateDrawStringParams();
730 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 703 EXPECT_EQ(label.text(), params->text);
731 EXPECT_EQ(label.text(), paint_text);
732 // The text should be right aligned horizontally and centered vertically. 704 // The text should be right aligned horizontally and centered vertically.
733 EXPECT_EQ(border.left() + extra.width(), text_bounds.x()); 705 EXPECT_EQ(border.left() + extra.width(), params->bounds.x());
734 EXPECT_EQ(border.top(), text_bounds.y()); 706 EXPECT_EQ(border.top(), params->bounds.y());
735 EXPECT_EQ(required_size.width(), text_bounds.width()); 707 EXPECT_EQ(required_size.width(), params->bounds.width());
736 EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height()); 708 EXPECT_EQ(label.GetContentsBounds().height(), params->bounds.height());
737 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT, 709 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_RIGHT,
738 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 710 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
739 gfx::Canvas::TEXT_ALIGN_CENTER | 711 gfx::Canvas::TEXT_ALIGN_CENTER |
740 gfx::Canvas::TEXT_ALIGN_RIGHT)); 712 gfx::Canvas::TEXT_ALIGN_RIGHT));
741 713
742 // ALIGN_RIGHT text. 714 // ALIGN_RIGHT text.
743 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT); 715 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
744 paint_text.clear(); 716 label.ResetLayoutCache();
745 text_bounds.SetRect(0, 0, 0, 0); 717 params = label.CalculateDrawStringParams();
746 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 718 EXPECT_EQ(label.text(), params->text);
747 EXPECT_EQ(label.text(), paint_text);
748 // The text should be left aligned horizontally and centered vertically. 719 // The text should be left aligned horizontally and centered vertically.
749 EXPECT_EQ(border.left(), text_bounds.x()); 720 EXPECT_EQ(border.left(), params->bounds.x());
750 EXPECT_EQ(border.top(), text_bounds.y()); 721 EXPECT_EQ(border.top(), params->bounds.y());
751 EXPECT_EQ(required_size.width(), text_bounds.width()); 722 EXPECT_EQ(required_size.width(), params->bounds.width());
752 EXPECT_EQ(label.GetContentsBounds().height(), text_bounds.height()); 723 EXPECT_EQ(label.GetContentsBounds().height(), params->bounds.height());
753 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT, 724 EXPECT_EQ(gfx::Canvas::TEXT_ALIGN_LEFT,
754 flags & (gfx::Canvas::TEXT_ALIGN_LEFT | 725 params->flags & (gfx::Canvas::TEXT_ALIGN_LEFT |
755 gfx::Canvas::TEXT_ALIGN_CENTER | 726 gfx::Canvas::TEXT_ALIGN_CENTER |
756 gfx::Canvas::TEXT_ALIGN_RIGHT)); 727 gfx::Canvas::TEXT_ALIGN_RIGHT));
757 728
758 // Reset locale. 729 // Reset locale.
759 base::i18n::SetICUDefaultLocale(locale); 730 base::i18n::SetICUDefaultLocale(locale);
760 } 731 }
761 732
762 // On Linux the underlying pango routines require a max height in order to 733 // On Linux the underlying pango routines require a max height in order to
763 // ellide multiline text. So until that can be resolved, we set all 734 // ellide multiline text. So until that can be resolved, we set all
764 // multiline lables to not ellide in Linux only. 735 // multiline lables to not ellide in Linux only.
765 TEST_F(LabelTest, DrawMultiLineStringInRTL) { 736 TEST_F(LabelTest, DrawMultiLineStringInRTL) {
766 Label label; 737 Label label;
767 label.SetFocusable(false); 738 label.SetFocusable(false);
768 739
769 // Test for RTL. 740 // Test for RTL.
770 std::string locale = l10n_util::GetApplicationLocale(""); 741 std::string locale = l10n_util::GetApplicationLocale("");
771 base::i18n::SetICUDefaultLocale("he"); 742 base::i18n::SetICUDefaultLocale("he");
772 743
773 label.SetText(ASCIIToUTF16("Another string\nwith returns\n\n!")); 744 label.SetText(ASCIIToUTF16("Another string\nwith returns\n\n!"));
774 label.SetMultiLine(true); 745 label.SetMultiLine(true);
775 label.SizeToFit(0); 746 label.SizeToFit(0);
776 gfx::Size extra(50, 10); 747 gfx::Size extra(50, 10);
777 label.SetBounds(label.x(), label.y(), 748 label.SetBounds(label.x(), label.y(),
778 label.width() + extra.width(), 749 label.width() + extra.width(),
779 label.height() + extra.height()); 750 label.height() + extra.height());
780 751
781 // Do some basic verifications for all three alignments. 752 // Do some basic verifications for all three alignments.
782 base::string16 paint_text; 753 const Label::DrawStringParams* params = label.CalculateDrawStringParams();
783 gfx::Rect text_bounds; 754 EXPECT_EQ(label.text(), params->text);
784 int flags = -1; 755 EXPECT_EQ(extra.width() / 2, params->bounds.x());
785 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 756 EXPECT_EQ(extra.height() / 2, params->bounds.y());
786 EXPECT_EQ(label.text(), paint_text); 757 EXPECT_GT(params->bounds.width(), kMinTextDimension);
787 EXPECT_EQ(extra.width() / 2, text_bounds.x()); 758 EXPECT_GT(params->bounds.height(), kMinTextDimension);
788 EXPECT_EQ(extra.height() / 2, text_bounds.y()); 759 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & params->flags);
789 EXPECT_GT(text_bounds.width(), kMinTextDimension); 760 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_CENTER & params->flags);
790 EXPECT_GT(text_bounds.height(), kMinTextDimension);
791 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags);
792 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_CENTER & flags);
793 #if !defined(OS_WIN) 761 #if !defined(OS_WIN)
794 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags); 762 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & params->flags);
795 #endif 763 #endif
796 gfx::Rect center_bounds(text_bounds); 764 gfx::Rect center_bounds(params->bounds);
797 765
798 label.SetHorizontalAlignment(gfx::ALIGN_LEFT); 766 label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
799 paint_text.clear(); 767 label.ResetLayoutCache();
800 text_bounds.SetRect(0, 0, 0, 0); 768 params = label.CalculateDrawStringParams();
801 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 769 EXPECT_EQ(label.text(), params->text);
802 EXPECT_EQ(label.text(), paint_text); 770 EXPECT_EQ(extra.width(), params->bounds.x());
803 EXPECT_EQ(extra.width(), text_bounds.x()); 771 EXPECT_EQ(extra.height() / 2, params->bounds.y());
804 EXPECT_EQ(extra.height() / 2, text_bounds.y()); 772 EXPECT_GT(params->bounds.width(), kMinTextDimension);
805 EXPECT_GT(text_bounds.width(), kMinTextDimension); 773 EXPECT_GT(params->bounds.height(), kMinTextDimension);
806 EXPECT_GT(text_bounds.height(), kMinTextDimension); 774 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & params->flags);
807 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags); 775 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_RIGHT & params->flags);
808 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_RIGHT & flags);
809 #if !defined(OS_WIN) 776 #if !defined(OS_WIN)
810 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags); 777 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & params->flags);
811 #endif 778 #endif
812 779
813 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT); 780 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
814 paint_text.clear(); 781 label.ResetLayoutCache();
815 text_bounds.SetRect(0, 0, 0, 0); 782 params = label.CalculateDrawStringParams();
816 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 783 EXPECT_EQ(label.text(), params->text);
817 EXPECT_EQ(label.text(), paint_text); 784 EXPECT_EQ(0, params->bounds.x());
818 EXPECT_EQ(0, text_bounds.x()); 785 EXPECT_EQ(extra.height() / 2, params->bounds.y());
819 EXPECT_EQ(extra.height() / 2, text_bounds.y()); 786 EXPECT_GT(params->bounds.width(), kMinTextDimension);
820 EXPECT_GT(text_bounds.width(), kMinTextDimension); 787 EXPECT_GT(params->bounds.height(), kMinTextDimension);
821 EXPECT_GT(text_bounds.height(), kMinTextDimension); 788 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & params->flags);
822 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags); 789 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_LEFT & params->flags);
823 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_LEFT & flags);
824 #if !defined(OS_WIN) 790 #if !defined(OS_WIN)
825 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags); 791 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & params->flags);
826 #endif 792 #endif
827 793
828 // Test multiline drawing with a border. 794 // Test multiline drawing with a border.
829 gfx::Insets border(19, 92, 23, 2); 795 gfx::Insets border(19, 92, 23, 2);
830 label.SetBorder(Border::CreateEmptyBorder( 796 label.SetBorder(Border::CreateEmptyBorder(
831 border.top(), border.left(), border.bottom(), border.right())); 797 border.top(), border.left(), border.bottom(), border.right()));
832 label.SizeToFit(0); 798 label.SizeToFit(0);
833 label.SetBounds(label.x(), label.y(), 799 label.SetBounds(label.x(), label.y(),
834 label.width() + extra.width(), 800 label.width() + extra.width(),
835 label.height() + extra.height()); 801 label.height() + extra.height());
836 802
837 label.SetHorizontalAlignment(gfx::ALIGN_CENTER); 803 label.SetHorizontalAlignment(gfx::ALIGN_CENTER);
838 paint_text.clear(); 804 label.ResetLayoutCache();
839 text_bounds.SetRect(0, 0, 0, 0); 805 params = label.CalculateDrawStringParams();
840 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 806 EXPECT_EQ(label.text(), params->text);
841 EXPECT_EQ(label.text(), paint_text); 807 EXPECT_EQ(border.left() + extra.width() / 2, params->bounds.x());
842 EXPECT_EQ(border.left() + extra.width() / 2, text_bounds.x()); 808 EXPECT_EQ(border.top() + extra.height() / 2, params->bounds.y());
843 EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y()); 809 EXPECT_EQ(center_bounds.width(), params->bounds.width());
844 EXPECT_EQ(center_bounds.width(), text_bounds.width()); 810 EXPECT_EQ(center_bounds.height(), params->bounds.height());
845 EXPECT_EQ(center_bounds.height(), text_bounds.height()); 811 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & params->flags);
846 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags); 812 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_CENTER & params->flags);
847 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_CENTER & flags);
848 #if !defined(OS_WIN) 813 #if !defined(OS_WIN)
849 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags); 814 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & params->flags);
850 #endif 815 #endif
851 816
852 label.SetHorizontalAlignment(gfx::ALIGN_LEFT); 817 label.SetHorizontalAlignment(gfx::ALIGN_LEFT);
853 paint_text.clear(); 818 label.ResetLayoutCache();
854 text_bounds.SetRect(0, 0, 0, 0); 819 params = label.CalculateDrawStringParams();
855 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 820 EXPECT_EQ(label.text(), params->text);
856 EXPECT_EQ(label.text(), paint_text); 821 EXPECT_EQ(border.left() + extra.width(), params->bounds.x());
857 EXPECT_EQ(border.left() + extra.width(), text_bounds.x()); 822 EXPECT_EQ(border.top() + extra.height() / 2, params->bounds.y());
858 EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y()); 823 EXPECT_EQ(center_bounds.width(), params->bounds.width());
859 EXPECT_EQ(center_bounds.width(), text_bounds.width()); 824 EXPECT_EQ(center_bounds.height(), params->bounds.height());
860 EXPECT_EQ(center_bounds.height(), text_bounds.height()); 825 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & params->flags);
861 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags); 826 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_RIGHT & params->flags);
862 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_RIGHT & flags);
863 #if !defined(OS_WIN) 827 #if !defined(OS_WIN)
864 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags); 828 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & params->flags);
865 #endif 829 #endif
866 830
867 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT); 831 label.SetHorizontalAlignment(gfx::ALIGN_RIGHT);
868 paint_text.clear(); 832 label.ResetLayoutCache();
869 text_bounds.SetRect(0, 0, 0, 0); 833 params = label.CalculateDrawStringParams();
870 label.CalculateDrawStringParams(&paint_text, &text_bounds, &flags); 834 EXPECT_EQ(label.text(), params->text);
871 EXPECT_EQ(label.text(), paint_text); 835 EXPECT_EQ(border.left(), params->bounds.x());
872 EXPECT_EQ(border.left(), text_bounds.x()); 836 EXPECT_EQ(border.top() + extra.height() / 2, params->bounds.y());
873 EXPECT_EQ(border.top() + extra.height() / 2, text_bounds.y()); 837 EXPECT_EQ(center_bounds.width(), params->bounds.width());
874 EXPECT_EQ(center_bounds.width(), text_bounds.width()); 838 EXPECT_EQ(center_bounds.height(), params->bounds.height());
875 EXPECT_EQ(center_bounds.height(), text_bounds.height()); 839 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & params->flags);
876 EXPECT_TRUE(gfx::Canvas::MULTI_LINE & flags); 840 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_LEFT & params->flags);
877 EXPECT_TRUE(gfx::Canvas::TEXT_ALIGN_LEFT & flags);
878 #if !defined(OS_WIN) 841 #if !defined(OS_WIN)
879 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & flags); 842 EXPECT_TRUE(gfx::Canvas::NO_ELLIPSIS & params->flags);
880 #endif 843 #endif
881 844
882 // Reset Locale 845 // Reset Locale
883 base::i18n::SetICUDefaultLocale(locale); 846 base::i18n::SetICUDefaultLocale(locale);
884 } 847 }
885 848
886 // Ensure the subpixel rendering flag and background color alpha are respected. 849 // Ensure the subpixel rendering flag and background color alpha are respected.
887 TEST_F(LabelTest, DisableSubpixelRendering) { 850 TEST_F(LabelTest, DisableSubpixelRendering) {
888 Label label; 851 Label label;
889 label.SetBackgroundColor(SK_ColorWHITE); 852 label.SetBackgroundColor(SK_ColorWHITE);
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(-1, 20))); 913 EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(-1, 20)));
951 label.SetHandlesTooltips(true); 914 label.SetHandlesTooltips(true);
952 915
953 // GetTooltipHandlerForPoint works should work in child bounds. 916 // GetTooltipHandlerForPoint works should work in child bounds.
954 label.SetBounds(2, 2, 10, 10); 917 label.SetBounds(2, 2, 10, 10);
955 EXPECT_EQ(&label, label.GetTooltipHandlerForPoint(gfx::Point(1, 5))); 918 EXPECT_EQ(&label, label.GetTooltipHandlerForPoint(gfx::Point(1, 5)));
956 EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(3, 11))); 919 EXPECT_FALSE(label.GetTooltipHandlerForPoint(gfx::Point(3, 11)));
957 } 920 }
958 921
959 } // namespace views 922 } // namespace views
OLDNEW
« ui/views/controls/label.cc ('K') | « ui/views/controls/label.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698