Skip to content

Commit 6671ef1

Browse files
committed
fix: default style of scrollbar
1 parent 3cc16d8 commit 6671ef1

3 files changed

Lines changed: 27 additions & 52 deletions

File tree

deft.css

Lines changed: 8 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ body {
2626
font-size: 14px;
2727
}
2828

29+
*::scrollbar, *::scrollbar {
30+
background: var(--deft-scrollbar-background);
31+
}
32+
33+
*::scrollbar-thumb, *::scrollbar-thumb {
34+
background: var(--deft-scrollbar-thumb-background);
35+
}
36+
2937
body[theme="dark"] {
3038
--deft-border-color: #6E7175;
3139
--deft-highlight-border-color: #5993B2;
@@ -82,37 +90,6 @@ button[disabled], button[disabled]:hover {
8290
border: 1px var(--deft-disabled-border-color);
8391
}
8492

85-
entry {
86-
background: var(--deft-form-control-background);
87-
border: 1px var(--deft-border-color);
88-
border-radius: 3px;
89-
min-height: 2em;
90-
padding: 4px;
91-
}
92-
93-
entry:hover {
94-
border: 1px var(--deft-highlight-border-color);
95-
}
96-
entry:focus {
97-
border: 1px var(--deft-highlight-border-color);
98-
}
99-
entry::placeholder {
100-
color: var(--deft-placeholder-color);
101-
}
102-
entry[disabled], entry[disabled]:hover {
103-
background: var(--deft-disabled-background);
104-
border: 1px var(--deft-disabled-border-color);
105-
color: var(--deft-disabled-color);
106-
}
107-
entry::scrollbar, scroll::scrollbar {
108-
background: var(--deft-scrollbar-background);
109-
}
110-
111-
entry::scrollbar-thumb, scroll::scrollbar-thumb {
112-
background: var(--deft-scrollbar-thumb-background);
113-
}
114-
115-
11693
checkbox::box {
11794
width: 1.2em;
11895
height: 1.2em;
@@ -203,14 +180,6 @@ text-input[disabled]::placeholder, text-edit[disabled]::placeholder {
203180
color: var(--deft-disabled-placeholder-color);
204181
}
205182

206-
text-edit::scrollbar, scroll::scrollbar {
207-
background: var(--deft-scrollbar-background);
208-
}
209-
210-
text-edit::scrollbar-thumb, scroll::scrollbar-thumb {
211-
background: var(--deft-scrollbar-thumb-background);
212-
}
213-
214183
select {
215184
background: var(--deft-form-control-background);
216185
border: 1px var(--deft-border-color);

src/element.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,8 +1005,7 @@ impl Element {
10051005
}
10061006
}
10071007
if !changed_pe_styles_map.is_empty() {
1008-
self.backend
1009-
.accept_pseudo_element_styles(changed_pe_styles_map);
1008+
self.accept_pseudo_element_styles(changed_pe_styles_map);
10101009
changed = true;
10111010
}
10121011

@@ -1016,6 +1015,11 @@ impl Element {
10161015
changed
10171016
}
10181017

1018+
fn accept_pseudo_element_styles(&mut self, styles: HashMap<String, Vec<ResolvedStyleProp>>) {
1019+
self.scrollable.accept_css_style(&styles);
1020+
self.backend.accept_pseudo_element_styles(styles);
1021+
}
1022+
10191023
pub fn register_event_listener<T: 'static, H: EventListener<T, ElementWeak> + 'static>(
10201024
&mut self,
10211025
listener: H,

src/element/paragraph.rs

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,18 @@ fn parse_text_decoration(value: &str) -> TextDecoration {
9797
decoration
9898
}
9999

100-
#[test]
101-
fn test_measure() {
102-
let text_demo = include_str!("../../Cargo.lock");
103-
let mut text = String::new();
104-
for i in 0..200 {
105-
text.push_str(text_demo);
100+
#[cfg(test)]
101+
mod tests {
102+
#[test]
103+
fn test_measure() {
104+
let text_demo = include_str!("../../Cargo.lock");
105+
let mut text = String::new();
106+
for i in 0..200 {
107+
text.push_str(text_demo);
108+
}
109+
// let font = DEFAULT_TYPE_FACE.with(|tf| Font::from_typeface(tf, 14.0));
110+
// debug!("font {:?}", font.typeface().family_name());
111+
// print_time!("measure time");
112+
// let result = font.measure_text(text.as_str(), None);
106113
}
107-
// let font = DEFAULT_TYPE_FACE.with(|tf| Font::from_typeface(tf, 14.0));
108-
// debug!("font {:?}", font.typeface().family_name());
109-
// print_time!("measure time");
110-
// let result = font.measure_text(text.as_str(), None);
111114
}
112-

0 commit comments

Comments
 (0)