forked from reya/gpui-native-kit
clean up
This commit is contained in:
@@ -7,7 +7,7 @@ use gpui::{
|
||||
Styled as _, Window, div,
|
||||
};
|
||||
use gpui_native_icons::{IconRole, icon};
|
||||
use gpui_native_theme::{ActiveTheme as _, Theme};
|
||||
use gpui_native_theme::ActiveTheme as _;
|
||||
use gpui_native_utils::{nav_key, paint_selectable_row, selectable_label_color};
|
||||
|
||||
/// The change reporter, fired with the next selection by pointer and keys.
|
||||
@@ -144,7 +144,7 @@ impl RenderOnce for List {
|
||||
.enumerate()
|
||||
.map(|(index, item)| {
|
||||
render_row(
|
||||
theme,
|
||||
cx,
|
||||
index,
|
||||
items.len(),
|
||||
item,
|
||||
@@ -185,7 +185,7 @@ impl RenderOnce for List {
|
||||
}
|
||||
|
||||
fn render_row(
|
||||
theme: &Theme,
|
||||
cx: &App,
|
||||
index: usize,
|
||||
count: usize,
|
||||
item: &ListItem,
|
||||
@@ -193,7 +193,8 @@ fn render_row(
|
||||
on_change: &Option<ChangeHandler>,
|
||||
focus: &FocusHandle,
|
||||
) -> AnyElement {
|
||||
let label_color = selectable_label_color(theme, selected, item.disabled);
|
||||
let theme = cx.theme();
|
||||
let label_color = selectable_label_color(cx, selected, item.disabled);
|
||||
let disabled = item.disabled;
|
||||
|
||||
div()
|
||||
@@ -208,7 +209,7 @@ fn render_row(
|
||||
.aria_selected(selected)
|
||||
.aria_position_in_set(index + 1)
|
||||
.aria_size_of_set(count)
|
||||
.map(|row| paint_selectable_row(theme, row, selected, disabled))
|
||||
.map(|row| paint_selectable_row(cx, row, selected, disabled))
|
||||
.when(!disabled, |row| {
|
||||
row.cursor_pointer().on_click({
|
||||
let on_change = on_change.clone();
|
||||
|
||||
Reference in New Issue
Block a user