{
let menu = self.device_menu.as_ref()?;
Some(
- crate::ui::Menu::plain(
+ crate::ui::Menu::new(
&self.theme,
"overlay-device-menu",
menu.items.clone(),
@@ -1074,18 +1074,18 @@ impl OverlayWindow {
.h(px(42.))
.flex_1()
.min_w_0()
- .rounded(px(8.))
+ .rounded(crate::theme::radius(crate::theme::RadiusToken::Default))
.border_1()
- .border_color(theme.gray_5)
- .bg(theme.gray_3)
- .text_color(theme.gray_12)
+ .border_color(theme.active_bg)
+ .bg(theme.surface_subtle)
+ .text_color(theme.text_primary)
.overflow_hidden()
.when(disabled, |row| row.opacity(0.7))
.when(!camera && enabled && !disabled, |row| {
row.child(
crate::ui::MicrophoneLevel::snapshot(
self.select.read(cx).microphone_fill,
- theme.blue_9.into(),
+ theme.primary.into(),
)
.absolute()
.top_0()
@@ -1101,7 +1101,7 @@ impl OverlayWindow {
})
.size(px(16.))
.flex_shrink_0()
- .text_color(theme.gray_11),
+ .text_color(theme.text_secondary),
)
.child(
div()
@@ -1126,17 +1126,17 @@ impl OverlayWindow {
.flex()
.items_center()
.justify_center()
- .rounded_full()
+ .rounded(crate::theme::radius(crate::theme::RadiusToken::Large))
.text_size(px(11.))
.bg(if enabled {
- Hsla::from(theme.blue_9)
+ Hsla::from(theme.primary)
} else {
- Hsla::from(theme.gray_5)
+ Hsla::from(theme.active_bg)
})
.text_color(if enabled {
gpui::white()
} else {
- Hsla::from(theme.gray_11)
+ Hsla::from(theme.text_secondary)
})
.child(if enabled { "On" } else { "Off" })
.on_mouse_down(MouseButton::Left, |_, _, cx| cx.stop_propagation())
@@ -1173,7 +1173,7 @@ impl OverlayWindow {
let state = self.mode_menu.as_ref()?;
let items = mode_menu_items(self.select.read(cx).recording_mode);
Some(
- crate::ui::Menu::plain(&self.theme, "overlay-mode-menu", items, state)
+ crate::ui::Menu::new(&self.theme, "overlay-mode-menu", items, state)
.on_select(cx.listener(|this, index: &usize, _window, cx| {
this.choose_mode(*index, cx);
}))
@@ -1195,7 +1195,7 @@ impl OverlayWindow {
.map(|(value, label)| crate::ui::MenuItem::new(*label, *value == current))
.collect();
Some(
- crate::ui::Menu::plain(&self.theme, "overlay-countdown-menu", items, state)
+ crate::ui::Menu::new(&self.theme, "overlay-countdown-menu", items, state)
.on_select(cx.listener(|this, index: &usize, _, cx| {
this.choose_countdown(*index, cx);
}))
@@ -1360,11 +1360,14 @@ impl OverlayWindow {
.justify_center()
.items_center()
// `