Overview
| Comment: | OFColor: Add singletons for the 16 HTML 4 colors |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
a4acd52c17cda8e884ed126fa4f04297 |
| User & Date: | js on 2020-05-21 16:57:31 |
| Other Links: | manifest | tags |
Context
|
2020-05-21
| ||
| 17:58 | OFStdIOStream: Add support for setting fg/bg color check-in: 30d639a494 user: js tags: trunk | |
| 16:57 | OFColor: Add singletons for the 16 HTML 4 colors check-in: a4acd52c17 user: js tags: trunk | |
|
2020-05-19
| ||
| 22:00 | tests: Gracefully handle SCTP being unsupported check-in: e8857652bf user: js tags: trunk | |
Changes
Modified src/OFColor.h from [53dfa6424a] to [59ecd06578].
| ︙ | ︙ | |||
26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 |
*/
@interface OFColor: OFObject
{
float _red, _green, _blue, _alpha;
OF_RESERVE_IVARS(4)
}
/*!
* @brief Creates a new color with the specified red, green, blue and alpha
* value.
*
* @param red The red value of the color, between 0.0 and 1.0
* @param green The green value of the color, between 0.0 and 1.0
* @param blue The blue value of the color, between 0.0 and 1.0
* @param alpha The alpha value of the color, between 0.0 and 1.0
* @return A new color with the specified red, green, blue and alpha value
*/
+ (instancetype)colorWithRed: (float)red
green: (float)green
blue: (float)blue
alpha: (float)alpha;
/*!
* @brief Initializes an already allocated color with the specified red, green,
* blue and alpha value.
*
* @param red The red value of the color, between 0.0 and 1.0
* @param green The green value of the color, between 0.0 and 1.0
* @param blue The blue value of the color, between 0.0 and 1.0
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 |
*/
@interface OFColor: OFObject
{
float _red, _green, _blue, _alpha;
OF_RESERVE_IVARS(4)
}
#ifdef OF_HAVE_CLASS_PROPERTIES
@property (class, readonly, nonatomic) OFColor *black;
@property (class, readonly, nonatomic) OFColor *silver;
@property (class, readonly, nonatomic) OFColor *grey;
@property (class, readonly, nonatomic) OFColor *white;
@property (class, readonly, nonatomic) OFColor *maroon;
@property (class, readonly, nonatomic) OFColor *red;
@property (class, readonly, nonatomic) OFColor *purple;
@property (class, readonly, nonatomic) OFColor *fuchsia;
@property (class, readonly, nonatomic) OFColor *green;
@property (class, readonly, nonatomic) OFColor *lime;
@property (class, readonly, nonatomic) OFColor *olive;
@property (class, readonly, nonatomic) OFColor *yellow;
@property (class, readonly, nonatomic) OFColor *navy;
@property (class, readonly, nonatomic) OFColor *blue;
@property (class, readonly, nonatomic) OFColor *teal;
@property (class, readonly, nonatomic) OFColor *aqua;
#endif
/*!
* @brief Creates a new color with the specified red, green, blue and alpha
* value.
*
* @param red The red value of the color, between 0.0 and 1.0
* @param green The green value of the color, between 0.0 and 1.0
* @param blue The blue value of the color, between 0.0 and 1.0
* @param alpha The alpha value of the color, between 0.0 and 1.0
* @return A new color with the specified red, green, blue and alpha value
*/
+ (instancetype)colorWithRed: (float)red
green: (float)green
blue: (float)blue
alpha: (float)alpha;
/*!
* @brief Returns the HTML color `black`.
*
* The RGBA value is (0, 0, 0, 1).
*
* @return The HTML color `black`
*/
+ (OFColor *)black;
/*!
* @brief Returns the HTML color `silver`.
*
* The RGBA value is (0.75, 0.75, 0.75, 1).
*
* @return The HTML color `silver`
*/
+ (OFColor *)silver;
/*!
* @brief Returns the HTML color `grey`.
*
* The RGBA value is (0.5, 0.5, 0.5, 1).
*
* @return The HTML color `grey`
*/
+ (OFColor *)grey;
/*!
* @brief Returns the HTML color `white`.
*
* The RGBA value is (1, 1, 1, 1).
*
* @return The HTML color `white`
*/
+ (OFColor *)white;
/*!
* @brief Returns the HTML color `maroon`.
*
* The RGBA value is (0.5, 0, 0, 1).
*
* @return The HTML color `maroon`
*/
+ (OFColor *)maroon;
/*!
* @brief Returns the HTML color `red`.
*
* The RGBA value is (1, 0, 0, 1).
*
* @return The HTML color `red`
*/
+ (OFColor *)red;
/*!
* @brief Returns the HTML color `purple`.
*
* The RGBA value is (0.5, 0, 0.5, 1).
*
* @return The HTML color `purple`
*/
+ (OFColor *)purple;
/*!
* @brief Returns the HTML color `fuchsia`.
*
* The RGBA value is (1, 0, 1, 1).
*
* @return The HTML color `fuchsia`
*/
+ (OFColor *)fuchsia;
/*!
* @brief Returns the HTML color `green`.
*
* The RGBA value is (0, 0.5, 0, 1).
*
* @return The HTML color `green`
*/
+ (OFColor *)green;
/*!
* @brief Returns the HTML color `lime`.
*
* The RGBA value is (0, 1, 0, 1).
*
* @return The HTML color `lime`
*/
+ (OFColor *)lime;
/*!
* @brief Returns the HTML color `olive`.
*
* The RGBA value is (0.5, 0.5, 0, 1).
*
* @return The HTML color `olive`
*/
+ (OFColor *)olive;
/*!
* @brief Returns the HTML color `yellow`.
*
* The RGBA value is (1, 1, 0, 1).
*
* @return The HTML color `yellow`
*/
+ (OFColor *)yellow;
/*!
* @brief Returns the HTML color `navy`.
*
* The RGBA value is (0, 0, 0.5, 1).
*
* @return The HTML color `navy`
*/
+ (OFColor *)navy;
/*!
* @brief Returns the HTML color `blue`.
*
* The RGBA value is (0, 0, 1, 1).
*
* @return The HTML color `blue`
*/
+ (OFColor *)blue;
/*!
* @brief Returns the HTML color `teal`.
*
* The RGBA value is (0, 0.5, 0.5, 1).
*
* @return The HTML color `teal`
*/
+ (OFColor *)teal;
/*!
* @brief Returns the HTML color `aqua`.
*
* The RGBA value is (0, 1, 1, 1).
*
* @return The HTML color `aqua`
*/
+ (OFColor *)aqua;
/*!
* @brief Initializes an already allocated color with the specified red, green,
* blue and alpha value.
*
* @param red The red value of the color, between 0.0 and 1.0
* @param green The green value of the color, between 0.0 and 1.0
* @param blue The blue value of the color, between 0.0 and 1.0
|
| ︙ | ︙ |
Modified src/OFColor.m from [cae3bcbbaf] to [2fc8a36876].
| ︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 |
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFColor.h"
#import "OFInvalidArgumentException.h"
@implementation OFColor
+ (instancetype)colorWithRed: (float)red
green: (float)green
blue: (float)blue
alpha: (float)alpha
{
return [[[self alloc] initWithRed: red
green: green
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 |
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFColor.h"
#import "once.h"
#import "OFInvalidArgumentException.h"
@implementation OFColor
#define PREDEFINED_COLOR(name, r, g, b) \
static OFColor *name = nil; \
\
static void \
initPredefinedColor_##name(void) \
{ \
name = [[OFColor alloc] initWithRed: r \
green: g \
blue: b \
alpha: 1]; \
} \
\
+ (OFColor *)name \
{ \
static of_once_t onceControl = OF_ONCE_INIT; \
of_once(&onceControl, initPredefinedColor_##name); \
\
return name; \
}
PREDEFINED_COLOR(black, 0.00, 0.00, 0.00)
PREDEFINED_COLOR(silver, 0.75, 0.75, 0.75)
PREDEFINED_COLOR(grey, 0.50, 0.50, 0.50)
PREDEFINED_COLOR(white, 1.00, 1.00, 1.00)
PREDEFINED_COLOR(maroon, 0.50, 0.00, 0.00)
PREDEFINED_COLOR(red, 1.00, 0.00, 0.00)
PREDEFINED_COLOR(purple, 0.50, 0.00, 0.50)
PREDEFINED_COLOR(fuchsia, 1.00, 0.00, 1.00)
PREDEFINED_COLOR(green, 0.00, 0.50, 0.00)
PREDEFINED_COLOR(lime, 0.00, 1.00, 0.00)
PREDEFINED_COLOR(olive, 0.50, 0.50, 0.00)
PREDEFINED_COLOR(yellow, 1.00, 1.00, 0.00)
PREDEFINED_COLOR(navy, 0.00, 0.00, 0.50)
PREDEFINED_COLOR(blue, 0.00, 0.00, 1.00)
PREDEFINED_COLOR(teal, 0.00, 0.50, 0.50)
PREDEFINED_COLOR(aqua, 0.00, 1.00, 1.00)
+ (instancetype)colorWithRed: (float)red
green: (float)green
blue: (float)blue
alpha: (float)alpha
{
return [[[self alloc] initWithRed: red
green: green
|
| ︙ | ︙ |