Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename on/off states to active/inactive

Browse source
This commit is contained in:
Piotr Osiewicz 2023-06-14 15:12:38 +02:00 • committed by Mikayla Maki
parent e92015b12f
commit 0256f89dd6
No known key found for this signature in database
10 changed files with 47 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -299,7 +299,12 @@ impl CollabTitlebarItem {
pub fn toggle_user_menu(&mut self, _: &ToggleUserMenu, cx: &mut ViewContext<Self>) {
let theme = theme::current(cx).clone();
let avatar_style = theme.workspace.titlebar.leader_avatar.clone();
let item_style = theme.context_menu.item.off_state().disabled_style().clone();
let item_style = theme
.context_menu
.item
.inactive_state()
.disabled_style()
.clone();
self.user_menu.update(cx, |user_menu, cx| {
let items = if let Some(user) = self.user_store.read(cx).current_user() {
vec![
@ -364,14 +369,14 @@ impl CollabTitlebarItem {
.with_margin_left(
titlebar
.toggle_contacts_button
.off_state()
.inactive_state()
.default
.icon_width,
)
.with_margin_top(
titlebar
.toggle_contacts_button
.off_state()
.inactive_state()
.default
.icon_width,
)

4
crates/collab_ui/src/contact_list.rs
View file

@ -798,7 +798,7 @@ impl ContactList {
.width
.or(theme.contact_avatar.height)
.unwrap_or(0.);
let row = &theme.project_row.off_state().default;
let row = &theme.project_row.inactive_state().default;
let tree_branch = theme.tree_branch;
let line_height = row.name.text.line_height(font_cache);
let cap_height = row.name.text.cap_height(font_cache);
@ -897,7 +897,7 @@ impl ContactList {
.width
.or(theme.contact_avatar.height)
.unwrap_or(0.);
let row = &theme.project_row.off_state().default;
let row = &theme.project_row.inactive_state().default;
let tree_branch = theme.tree_branch;
let line_height = row.name.text.line_height(font_cache);
let cap_height = row.name.text.cap_height(font_cache);