diff -r c11abf387a7d -r d5b30d6373fc project_files/HedgewarsMobile/Classes/SquareButtonView.m --- a/project_files/HedgewarsMobile/Classes/SquareButtonView.m Sat Jul 31 10:52:43 2010 +0200 +++ b/project_files/HedgewarsMobile/Classes/SquareButtonView.m Sat Jul 31 11:24:53 2010 +0200 @@ -32,12 +32,12 @@ // set the color to the first available one [self nextColor]; - + // this makes the button round and nice with a border [self.layer setCornerRadius:7.0f]; - [self.layer setMasksToBounds:YES]; + [self.layer setMasksToBounds:YES]; [self.layer setBorderWidth:2]; - + // this changes the color at button press [self addTarget:self action:@selector(nextColor) forControlEvents:UIControlEventTouchUpInside]; } @@ -51,11 +51,11 @@ colorIndex = 0; NSUInteger color = [[self.colorArray objectAtIndex:colorIndex] unsignedIntValue]; - self.backgroundColor = [UIColor colorWithRed:((color & 0x00FF0000) >> 16)/255.0f - green:((color & 0x0000FF00) >> 8)/255.0f - blue: (color & 0x000000FF)/255.0f + self.backgroundColor = [UIColor colorWithRed:((color & 0x00FF0000) >> 16)/255.0f + green:((color & 0x0000FF00) >> 8)/255.0f + blue: (color & 0x000000FF)/255.0f alpha:1.0f]; - + [ownerDictionary setObject:[NSNumber numberWithInt:color] forKey:@"color"]; } @@ -63,10 +63,10 @@ if (color != selectedColor) { selectedColor = color; colorIndex = [colorArray indexOfObject:[NSNumber numberWithUnsignedInt:color]]; - - self.backgroundColor = [UIColor colorWithRed:((color & 0x00FF0000) >> 16)/255.0f - green:((color & 0x0000FF00) >> 8)/255.0f - blue: (color & 0x000000FF)/255.0f + + self.backgroundColor = [UIColor colorWithRed:((color & 0x00FF0000) >> 16)/255.0f + green:((color & 0x0000FF00) >> 8)/255.0f + blue: (color & 0x000000FF)/255.0f alpha:1.0f]; } }