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

Fix arrow layout

Browse source
This commit is contained in:
Kirill Bulatov 2023-05-09 16:59:58 +03:00 • committed by Kirill Bulatov
parent 6fb8679184
commit 3da55c14a6
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/search/src/project_search.rs
View file

@ -1011,7 +1011,6 @@ impl View for ProjectSearchBar {
) )
.with_child( .with_child(
Flex::row() Flex::row()
// TODO kb better layout
.with_child( .with_child(
Flex::row() Flex::row()
.with_child( .with_child(

7
crates/workspace/src/toolbar.rs
View file

@ -126,6 +126,7 @@ impl View for Toolbar {
let container_style = theme.container; let container_style = theme.container;
let height = theme.height * primary_items_row_count as f32; let height = theme.height * primary_items_row_count as f32;
let nav_button_height = theme.height;
let button_style = theme.nav_button; let button_style = theme.nav_button;
let tooltip_style = cx.global::<Settings>().theme.tooltip.clone(); let tooltip_style = cx.global::<Settings>().theme.tooltip.clone();
@ -135,6 +136,7 @@ impl View for Toolbar {
.with_child(nav_button( .with_child(nav_button(
"icons/arrow_left_16.svg", "icons/arrow_left_16.svg",
button_style, button_style,
nav_button_height,
tooltip_style.clone(), tooltip_style.clone(),
enable_go_backward, enable_go_backward,
spacing, spacing,
@ -163,6 +165,7 @@ impl View for Toolbar {
.with_child(nav_button( .with_child(nav_button(
"icons/arrow_right_16.svg", "icons/arrow_right_16.svg",
button_style, button_style,
nav_button_height,
tooltip_style, tooltip_style,
enable_go_forward, enable_go_forward,
spacing, spacing,
@ -204,6 +207,7 @@ impl View for Toolbar {
fn nav_button<A: Action, F: 'static + Fn(&mut Toolbar, &mut ViewContext<Toolbar>)>( fn nav_button<A: Action, F: 'static + Fn(&mut Toolbar, &mut ViewContext<Toolbar>)>(
svg_path: &'static str, svg_path: &'static str,
style: theme::Interactive<theme::IconButton>, style: theme::Interactive<theme::IconButton>,
nav_button_height: f32,
tooltip_style: TooltipStyle, tooltip_style: TooltipStyle,
enabled: bool, enabled: bool,
spacing: f32, spacing: f32,
@ -227,8 +231,9 @@ fn nav_button<A: Action, F: 'static + Fn(&mut Toolbar, &mut ViewContext<Toolbar>
.with_style(style.container) .with_style(style.container)
.constrained() .constrained()
.with_width(style.button_width) .with_width(style.button_width)
.with_height(style.button_width) .with_height(nav_button_height)
.aligned() .aligned()
.top()
}) })
.with_cursor_style(if enabled { .with_cursor_style(if enabled {
CursorStyle::PointingHand CursorStyle::PointingHand