@@ -37,7 +37,7 @@ pub struct StyleProps {
37
37
38
38
#[ derive( PartialEq , Debug ) ]
39
39
pub enum BorderStyle {
40
- Solid ,
40
+ Medium ,
41
41
Dotted ,
42
42
Thick ,
43
43
Thin ,
@@ -203,9 +203,9 @@ impl BorderProps {
203
203
let attr_style = match self . style {
204
204
BorderStyle :: Dotted => "dotted" ,
205
205
BorderStyle :: Thick => "thick" ,
206
- BorderStyle :: Solid => "medium" ,
207
206
BorderStyle :: Double => "double" ,
208
207
BorderStyle :: Dashed => "hair" ,
208
+ BorderStyle :: Medium => "medium" ,
209
209
BorderStyle :: Thin => "thin" ,
210
210
} ;
211
211
@@ -434,12 +434,16 @@ fn str_to_border(v: &str, pos: BorderPosition) -> Option<BorderProps> {
434
434
"double" => BorderStyle :: Double ,
435
435
"dashed" => BorderStyle :: Dashed ,
436
436
"solid" => {
437
- let mut st = BorderStyle :: Solid ;
437
+ let mut st = BorderStyle :: Thin ;
438
+
438
439
if size == 0.5 {
439
440
st = BorderStyle :: Thin
441
+ } else if size == 1.0 {
442
+ st = BorderStyle :: Medium
440
443
} else if size == 2.0 {
441
444
st = BorderStyle :: Thick
442
445
}
446
+
443
447
st
444
448
}
445
449
_ => return None ,
@@ -521,7 +525,7 @@ fn str_to_border_test() {
521
525
assert_eq ! ( b. color, "FF9900CC" ) ;
522
526
assert_eq ! ( b. position, BorderPosition :: Top ) ;
523
527
assert_eq ! ( b. size, 1.0 ) ;
524
- assert_eq ! ( b. style, BorderStyle :: Solid ) ;
528
+ assert_eq ! ( b. style, BorderStyle :: Medium ) ;
525
529
526
530
maybe_border = str_to_border ( "0.5px solid #B3FFB3" , BorderPosition :: Right ) ;
527
531
b = maybe_border. unwrap ( ) ;
0 commit comments