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

Rename h_stack and v_stack to h_flex and v_flex, respectively (#4053)

Browse source 
This PR renames the `h_stack` and `v_stack` to `h_flex` and `v_flex`,
respectively.

We were previously using `h_stack` and `v_stack` to match SwiftUI, but
`h_flex` and `v_flex` fit better with the web/flexbox terminology that
the rest of GPUI uses.

Additionally, we were already calling the utility functions used to
implement `h_stack` and `v_stack` by the new names.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-01-15 11:34:06 -05:00 • committed by GitHub
parent b136d21ebf
commit 90f4c70a82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
69 changed files with 271 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/editor/src/element.rs
View file

@ -53,7 +53,7 @@ use std::{
use sum_tree::Bias;
use theme::{ActiveTheme, PlayerColor};
use ui::prelude::*;
use ui::{h_stack, ButtonLike, ButtonStyle, IconButton, Tooltip};
use ui::{h_flex, ButtonLike, ButtonStyle, IconButton, Tooltip};
use util::ResultExt;
use workspace::item::Item;
@ -2293,7 +2293,7 @@ impl EditorElement {
.size_full()
.p_1p5()
.child(
h_stack()
h_flex()
.id("path header block")
.py_1p5()
.pl_3()
@ -2306,8 +2306,8 @@ impl EditorElement {
.justify_between()
.hover(|style| style.bg(cx.theme().colors().element_hover))
.child(
h_stack().gap_3().child(
h_stack()
h_flex().gap_3().child(
h_flex()
.gap_2()
.child(
filename
@ -2339,12 +2339,12 @@ impl EditorElement {
}),
)
} else {
h_stack()
h_flex()
.id(("collapsed context", block_id))
.size_full()
.gap(gutter_padding)
.child(
h_stack()
h_flex()
.justify_end()
.flex_none()
.w(gutter_width - gutter_padding)