From 799278e2966c50711fd76dc2def85abaac2790d2 Mon Sep 17 00:00:00 2001 From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com> Date: Fri, 11 Aug 2023 17:02:25 +0200 Subject: [PATCH] Add row_height --- crates/search/src/project_search.rs | 4 +++- crates/search/src/search_bar.rs | 4 ++-- crates/theme/src/theme.rs | 1 + styles/src/style_tree/search.ts | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/crates/search/src/project_search.rs b/crates/search/src/project_search.rs index a3ae61f0a88f7f164f95120e65db6dbbe841f1d7..aa30d472439b2a529cda355e64a8cab10ec402f5 100644 --- a/crates/search/src/project_search.rs +++ b/crates/search/src/project_search.rs @@ -1592,7 +1592,8 @@ impl View for ProjectSearchBar { .top() .left(), ) - .contained() + .constrained() + .with_max_height(theme.search.search_bar_row_height) .flex(1., true), ) .with_child( @@ -1609,6 +1610,7 @@ impl View for ProjectSearchBar { .constrained() .with_min_width(theme.search.editor.min_width) .with_max_width(theme.search.editor.max_width) + .with_max_height(theme.search.search_bar_row_height) .flex(1., false), ) .contained() diff --git a/crates/search/src/search_bar.rs b/crates/search/src/search_bar.rs index 6cdb36acc3cd38ad9e775d2ec3b8557bc55ac1b0..593e0aeb69d2ea00ceb79f1dfdc93589ea38fd38 100644 --- a/crates/search/src/search_bar.rs +++ b/crates/search/src/search_bar.rs @@ -163,7 +163,7 @@ pub(crate) fn render_search_mode_button( .contained() .constrained() .with_max_width(side_width) - .with_height(32.), + .with_height(theme.search.search_bar_row_height), ) .with_child(label) .into_any() @@ -183,7 +183,7 @@ pub(crate) fn render_search_mode_button( .contained() .constrained() .with_max_width(side_width) - .with_height(32.), + .with_height(theme.search.search_bar_row_height), ) .into_any() } diff --git a/crates/theme/src/theme.rs b/crates/theme/src/theme.rs index e950845b4970b8d1007d405506d3a519b0b93741..dbcffe0382d9be9cef59768c35602bdfcf8f1ee7 100644 --- a/crates/theme/src/theme.rs +++ b/crates/theme/src/theme.rs @@ -389,6 +389,7 @@ pub struct Search { pub editor_icon: IconStyle, pub mode_button: Toggleable>, pub nav_button: Interactive, + pub search_bar_row_height: f32, } #[derive(Clone, Deserialize, Default, JsonSchema)] diff --git a/styles/src/style_tree/search.ts b/styles/src/style_tree/search.ts index 252e759a6d6c1db1b65e767ae5c96ded36c49f5b..c8e347a57d19c5bb65ffbe3eb74e62a2fa182b35 100644 --- a/styles/src/style_tree/search.ts +++ b/styles/src/style_tree/search.ts @@ -272,6 +272,7 @@ export default function search(): any { }, }, }), + search_bar_row_height: 32, } }