Skip to content

Commit a96eb29

Browse files
committed
[fix] add medium size for borders
1 parent 55e8618 commit a96eb29

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/style.rs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub struct StyleProps {
3737

3838
#[derive(PartialEq, Debug)]
3939
pub enum BorderStyle {
40-
Solid,
40+
Medium,
4141
Dotted,
4242
Thick,
4343
Thin,
@@ -203,9 +203,9 @@ impl BorderProps {
203203
let attr_style = match self.style {
204204
BorderStyle::Dotted => "dotted",
205205
BorderStyle::Thick => "thick",
206-
BorderStyle::Solid => "medium",
207206
BorderStyle::Double => "double",
208207
BorderStyle::Dashed => "hair",
208+
BorderStyle::Medium => "medium",
209209
BorderStyle::Thin => "thin",
210210
};
211211

@@ -434,12 +434,16 @@ fn str_to_border(v: &str, pos: BorderPosition) -> Option<BorderProps> {
434434
"double" => BorderStyle::Double,
435435
"dashed" => BorderStyle::Dashed,
436436
"solid" => {
437-
let mut st = BorderStyle::Solid;
437+
let mut st = BorderStyle::Thin;
438+
438439
if size == 0.5 {
439440
st = BorderStyle::Thin
441+
} else if size == 1.0 {
442+
st = BorderStyle::Medium
440443
} else if size == 2.0 {
441444
st = BorderStyle::Thick
442445
}
446+
443447
st
444448
}
445449
_ => return None,
@@ -521,7 +525,7 @@ fn str_to_border_test() {
521525
assert_eq!(b.color, "FF9900CC");
522526
assert_eq!(b.position, BorderPosition::Top);
523527
assert_eq!(b.size, 1.0);
524-
assert_eq!(b.style, BorderStyle::Solid);
528+
assert_eq!(b.style, BorderStyle::Medium);
525529

526530
maybe_border = str_to_border("0.5px solid #B3FFB3", BorderPosition::Right);
527531
b = maybe_border.unwrap();

0 commit comments

Comments
 (0)