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

Unified Diff: ios/chrome/browser/ui/omnibox/truncating_attributed_label.h

Issue 2695413003: Change OmniboxPopupTruncatingLabel to be based on UILabel. (Closed)
Patch Set: Cache gradient, restore handling of text alignment. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/omnibox/truncating_attributed_label.h
diff --git a/ios/chrome/browser/ui/omnibox/truncating_attributed_label.h b/ios/chrome/browser/ui/omnibox/truncating_attributed_label.h
index d8fec99fc89e92566ddc2211a3186414cf9b4f30..41ab47e64047134467fa1e604941a01d9a209451 100644
--- a/ios/chrome/browser/ui/omnibox/truncating_attributed_label.h
+++ b/ios/chrome/browser/ui/omnibox/truncating_attributed_label.h
@@ -5,8 +5,6 @@
#ifndef IOS_CHROME_BROWSER_UI_OMNIBOX_TRUNCATING_ATTRIBUTED_LABEL_H_
#define IOS_CHROME_BROWSER_UI_OMNIBOX_TRUNCATING_ATTRIBUTED_LABEL_H_
-#import <CoreText/CoreText.h>
-#import <QuartzCore/QuartzCore.h>
#import <UIKit/UIKit.h>
#include "base/mac/scoped_nsobject.h"
@@ -18,28 +16,15 @@ typedef enum {
OmniboxPopupTruncatingHead | OmniboxPopupTruncatingTail
} OmniboxPopupTruncatingMode;
-// This is a copy of GTMFadeTruncatingLabel that supports
-// NSMutableAttributedString to change font (face and size), and color by using
-// CATextLayer. Unlike GTMFadeTruncatingLabel, it's not based on a UILabel, so
-// it does not support shadowOffset and shadowColor, baselineAdjustment,
-// highlighted, minimumFontSize, and numberOfLines.
-@interface OmniboxPopupTruncatingLabel : UIView
+// A label which applies a fade-to-background color gradient to one or both ends
+// of the string if it is too large to fit the available area. It is based on
+// GTMFadeTruncatingLabel but uses the attributedText property of UILabel rather
+// than the text and font properties.
+@interface OmniboxPopupTruncatingLabel : UILabel
// Which side(s) to truncate.
@property(nonatomic, assign) OmniboxPopupTruncatingMode truncateMode;
-// Text alignment.
-@property(nonatomic, assign) NSTextAlignment textAlignment;
-
-// For display of an attributed string.
-@property(nonatomic, retain) NSMutableAttributedString* attributedText;
-
-// Set the label highlight state.
-@property(nonatomic, assign) BOOL highlighted;
-
-// Set the label highlight color.
-@property(nonatomic, retain) NSMutableAttributedString* highlightedText;
-
@end
#endif // IOS_CHROME_BROWSER_UI_OMNIBOX_TRUNCATING_ATTRIBUTED_LABEL_H_

Powered by Google App Engine
This is Rietveld 408576698