From 9b24048ce497178303e342471209a5f591796248 Mon Sep 17 00:00:00 2001 From: hennychen <511308538@qq.com> Date: Thu, 5 Jan 2017 17:16:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=B3=E8=BE=B9=E6=B7=BB=E5=8A=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WTagList.xcodeproj/project.pbxproj | 4 ++++ WTagList/Classes/WTagList.m | 21 ++++++++++++++------- WTagList/Classes/img_delete.png | Bin 0 -> 3637 bytes 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 WTagList/Classes/img_delete.png diff --git a/WTagList.xcodeproj/project.pbxproj b/WTagList.xcodeproj/project.pbxproj index 9c4e3bd..68b8926 100755 --- a/WTagList.xcodeproj/project.pbxproj +++ b/WTagList.xcodeproj/project.pbxproj @@ -19,6 +19,7 @@ 04DEC62915A8988A0034CA79 /* WTagList.m in Sources */ = {isa = PBXBuildFile; fileRef = 04DEC62815A8988A0034CA79 /* WTagList.m */; }; 04DEC62B15A898EF0034CA79 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04DEC62A15A898EF0034CA79 /* QuartzCore.framework */; }; 2D195BD416FBAC890069A5E3 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2D195BD316FBAC890069A5E3 /* Default-568h@2x.png */; }; + 5C2E58911E1E45DD00B777F5 /* img_delete.png in Resources */ = {isa = PBXBuildFile; fileRef = 5C2E58901E1E45DD00B777F5 /* img_delete.png */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -40,6 +41,7 @@ 04DEC62815A8988A0034CA79 /* WTagList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WTagList.m; sourceTree = ""; }; 04DEC62A15A898EF0034CA79 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 2D195BD316FBAC890069A5E3 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + 5C2E58901E1E45DD00B777F5 /* img_delete.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = img_delete.png; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -115,6 +117,7 @@ 04DEC62615A8988A0034CA79 /* Classes */ = { isa = PBXGroup; children = ( + 5C2E58901E1E45DD00B777F5 /* img_delete.png */, 04DEC62715A8988A0034CA79 /* WTagList.h */, 04DEC62815A8988A0034CA79 /* WTagList.m */, ); @@ -174,6 +177,7 @@ files = ( 04DEC61115A897B80034CA79 /* InfoPlist.strings in Resources */, 04DEC61D15A897B80034CA79 /* ViewController_iPhone.xib in Resources */, + 5C2E58911E1E45DD00B777F5 /* img_delete.png in Resources */, 04DEC62015A897B80034CA79 /* ViewController_iPad.xib in Resources */, 2D195BD416FBAC890069A5E3 /* Default-568h@2x.png in Resources */, ); diff --git a/WTagList/Classes/WTagList.m b/WTagList/Classes/WTagList.m index 8de46a4..5c8cdfc 100755 --- a/WTagList/Classes/WTagList.m +++ b/WTagList/Classes/WTagList.m @@ -8,21 +8,24 @@ #import "WTagList.h" #import -#define CORNER_RADIUS 10.0f +#define CORNER_RADIUS 2.0f #define LABEL_MARGIN_DEFAULT 5.0f #define BOTTOM_MARGIN_DEFAULT 5.0f #define FONT_SIZE_DEFAULT 13.0f #define HORIZONTAL_PADDING_DEFAULT 7.0f #define VERTICAL_PADDING_DEFAULT 3.0f -#define BACKGROUND_COLOR [UIColor colorWithRed:0.93 green:0.93 blue:0.93 alpha:1.00] +#define BACKGROUND_COLOR [UIColor colorWithRed:161/255.0 green:170/255.0 blue:201/255.0 alpha:1.00] #define TEXT_COLOR [UIColor blackColor] #define TEXT_SHADOW_COLOR [UIColor whiteColor] #define TEXT_SHADOW_OFFSET CGSizeMake(0.0f, 1.0f) #define BORDER_COLOR [UIColor lightGrayColor].CGColor -#define BORDER_WIDTH 1.0f +#define BORDER_WIDTH 0.0f //#define HIGHLIGHTED_BACKGROUND_COLOR [UIColor colorWithRed:0.40 green:0.80 blue:1.00 alpha:0.5] #define DEFAULT_AUTOMATIC_RESIZE NO +#define IMG_WIDTH_HEIGHT 18 +#define IMGNAME @"img_delete.png" + @interface WTagList() @property (nonatomic, assign) BOOL isTagsSettingUp; @@ -367,6 +370,8 @@ - (id)initForList:(WTagList *)parentList { _label = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 0, 0)]; [_label setBackgroundColor:[UIColor clearColor]]; [_label setTextAlignment:NSTextAlignmentCenter]; + + [self addSubview:_label]; _button = [UIButton buttonWithType:UIButtonTypeCustom]; @@ -391,8 +396,8 @@ -(void)applyParentTheme { self.backgroundColor = self.parentList.defaultBackgroundColor; self.textColor = self.parentList.defaultTextColor; - self.textShadowColor = self.parentList.defaultTextShadowColor; - self.textShadowOffset = self.parentList.defaultTextShadowOffset; + //self.textShadowColor = self.parentList.defaultTextShadowColor; + //self.textShadowOffset = self.parentList.defaultTextShadowOffset; self.cornerRadius = self.parentList.defaultCornerRadius; self.borderColor = self.parentList.defaultBorderColor.CGColor; @@ -410,9 +415,11 @@ -(void)setText:(NSString *)text { textSize.width = MAX(textSize.width, minimumTextWidth); textSize.height += self.parentList.verticalPadding*2; - self.frame = CGRectMake(0, 0, textSize.width+self.parentList.horizontalPadding*2, textSize.height); + self.frame = CGRectMake(0, 0, textSize.width+self.parentList.horizontalPadding*2 + IMG_WIDTH_HEIGHT+2.0, textSize.height); self.label.frame = CGRectMake(self.parentList.horizontalPadding, 0, MIN(textSize.width, self.frame.size.width), textSize.height); - + UIImageView *imgView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:IMGNAME]]; + imgView.frame = CGRectMake(textSize.width+self.parentList.horizontalPadding, (textSize.height - IMG_WIDTH_HEIGHT)*0.5, IMG_WIDTH_HEIGHT, IMG_WIDTH_HEIGHT); + [_label addSubview:imgView]; [_button setAccessibilityLabel:self.label.text]; } diff --git a/WTagList/Classes/img_delete.png b/WTagList/Classes/img_delete.png new file mode 100644 index 0000000000000000000000000000000000000000..9d88e7a788a79f39f7b244c42d80c6cc3909cd04 GIT binary patch literal 3637 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 Hu0mjf??w3v literal 0 HcmV?d00001