Skip to content

Commit 30de5b8

Browse files
committedFeb 11, 2018
feat(css): add parsing support for "border-left: 0;"
1 parent 746967f commit 30de5b8

File tree

1 file changed

+22
-11
lines changed

1 file changed

+22
-11
lines changed
 

‎src/gui/css_parser.c

+22-11
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ static int OnParseImage( LCUI_CSSParserStyleContext ctx, const char *str )
195195
return -1;
196196
}
197197

198-
static int OnParseStyleOption( LCUI_CSSParserStyleContext ctx, const char *str )
198+
static int OnParseStyleOption( LCUI_CSSParserStyleContext ctx,
199+
const char *str )
199200
{
200201
LCUI_Style s = &ctx->sheet->sheet[ctx->parser->key];
201202
int v = LCUI_GetStyleValue( str );
@@ -208,7 +209,8 @@ static int OnParseStyleOption( LCUI_CSSParserStyleContext ctx, const char *str )
208209
return 0;
209210
}
210211

211-
static int OnParseBorder( LCUI_CSSParserStyleContext ctx, const char *str )
212+
static int OnParseBorder( LCUI_CSSParserStyleContext ctx,
213+
const char *str )
212214
{
213215
LCUI_StyleSheet ss = ctx->sheet;
214216
LCUI_StyleRec slist[3] = { { 0 }, { 0 }, { 0 } };
@@ -246,7 +248,8 @@ static int OnParseBorder( LCUI_CSSParserStyleContext ctx, const char *str )
246248
return 0;
247249
}
248250

249-
static int OnParseBorderRadius( LCUI_CSSParserStyleContext ctx, const char *str )
251+
static int OnParseBorderRadius( LCUI_CSSParserStyleContext ctx,
252+
const char *str )
250253
{
251254
LCUI_StyleRec s;
252255
LCUI_StyleSheet ss = ctx->sheet;
@@ -260,12 +263,13 @@ static int OnParseBorderRadius( LCUI_CSSParserStyleContext ctx, const char *str
260263
return 0;
261264
}
262265

263-
static int OnParseBorderLeft( LCUI_CSSParserStyleContext ctx, const char *str )
266+
static int OnParseBorderLeft( LCUI_CSSParserStyleContext ctx,
267+
const char *str )
264268
{
265269
LCUI_StyleRec slist[3];
266270
LCUI_StyleSheet ss = ctx->sheet;
267271
int i, mode = SPLIT_COLOR | SPLIT_NUMBER | SPLIT_STYLE;
268-
if( SplitValues(str, slist, 3, mode) < 3 ) {
272+
if( SplitValues(str, slist, 3, mode) < 1 ) {
269273
return -1;
270274
}
271275
for( i = 0; i < 3; ++i ) {
@@ -274,6 +278,7 @@ static int OnParseBorderLeft( LCUI_CSSParserStyleContext ctx, const char *str )
274278
ss->sheet[key_border_left_color] = slist[i];
275279
break;
276280
case SVT_PX:
281+
case SVT_VALUE:
277282
ss->sheet[key_border_left_width] = slist[i];
278283
break;
279284
case SVT_style:
@@ -285,12 +290,13 @@ static int OnParseBorderLeft( LCUI_CSSParserStyleContext ctx, const char *str )
285290
return 0;
286291
}
287292

288-
static int OnParseBorderTop( LCUI_CSSParserStyleContext ctx, const char *str )
293+
static int OnParseBorderTop( LCUI_CSSParserStyleContext ctx,
294+
const char *str )
289295
{
290296
LCUI_StyleRec slist[3];
291297
LCUI_StyleSheet ss = ctx->sheet;
292298
int i, mode = SPLIT_COLOR | SPLIT_NUMBER | SPLIT_STYLE;
293-
if( SplitValues(str, slist, 3, mode) < 3 ) {
299+
if( SplitValues(str, slist, 3, mode) < 1 ) {
294300
return -1;
295301
}
296302
for( i = 0; i < 3; ++i ) {
@@ -299,6 +305,7 @@ static int OnParseBorderTop( LCUI_CSSParserStyleContext ctx, const char *str )
299305
ss->sheet[key_border_top_color] = slist[i];
300306
break;
301307
case SVT_PX:
308+
case SVT_VALUE:
302309
ss->sheet[key_border_top_width] = slist[i];
303310
break;
304311
case SVT_style:
@@ -310,12 +317,13 @@ static int OnParseBorderTop( LCUI_CSSParserStyleContext ctx, const char *str )
310317
return 0;
311318
}
312319

313-
static int OnParseBorderRight( LCUI_CSSParserStyleContext ctx, const char *str )
320+
static int OnParseBorderRight( LCUI_CSSParserStyleContext ctx,
321+
const char *str )
314322
{
315323
LCUI_StyleRec slist[3];
316324
LCUI_StyleSheet ss = ctx->sheet;
317325
int i, mode = SPLIT_COLOR | SPLIT_NUMBER | SPLIT_STYLE;
318-
if( SplitValues(str, slist, 3, mode) < 3 ) {
326+
if( SplitValues(str, slist, 3, mode) < 1 ) {
319327
return -1;
320328
}
321329
for( i = 0; i < 3; ++i ) {
@@ -324,6 +332,7 @@ static int OnParseBorderRight( LCUI_CSSParserStyleContext ctx, const char *str )
324332
ss->sheet[key_border_right_color] = slist[i];
325333
break;
326334
case SVT_PX:
335+
case SVT_VALUE:
327336
ss->sheet[key_border_right_width] = slist[i];
328337
break;
329338
case SVT_style:
@@ -335,12 +344,13 @@ static int OnParseBorderRight( LCUI_CSSParserStyleContext ctx, const char *str )
335344
return 0;
336345
}
337346

338-
static int OnParseBorderBottom( LCUI_CSSParserStyleContext ctx, const char *str )
347+
static int OnParseBorderBottom( LCUI_CSSParserStyleContext ctx,
348+
const char *str )
339349
{
340350
LCUI_StyleRec slist[3];
341351
LCUI_StyleSheet ss = ctx->sheet;
342352
int i, mode = SPLIT_COLOR | SPLIT_NUMBER | SPLIT_STYLE;
343-
if( SplitValues(str, slist, 3, mode) < 3 ) {
353+
if( SplitValues(str, slist, 3, mode) < 1 ) {
344354
return -1;
345355
}
346356
for( i = 0; i < 3; ++i ) {
@@ -349,6 +359,7 @@ static int OnParseBorderBottom( LCUI_CSSParserStyleContext ctx, const char *str
349359
ss->sheet[key_border_bottom_color] = slist[i];
350360
break;
351361
case SVT_PX:
362+
case SVT_VALUE:
352363
ss->sheet[key_border_bottom_width] = slist[i];
353364
break;
354365
case SVT_style:

0 commit comments

Comments
 (0)