Skip to content

fix: prevent custom endpoint labels from overflowing #12197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
oz-for-oss wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: prevent custom endpoint labels from overflowing #12197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/src/settings_view/ai_page.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use warpui::elements::{
use warpui::fonts::{Properties, Weight};
use warpui::keymap::{ContextPredicate, Keystroke};
use warpui::platform::Cursor;
use warpui::text_layout::ClipConfig;
use warpui::ui_components::button::ButtonVariant;
use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
use warpui::ui_components::slider::SliderStateHandle;
Expand Down Expand Up @@ -7488,13 +7489,18 @@ impl ApiKeysWidget {
appearance.ui_font_family(),
appearance.ui_font_size(),
)
.with_clip(ClipConfig::ellipsis())
.with_style(Properties::default().weight(Weight::Semibold))
.with_color(text_color.into())
.finish();

let left = Flex::column()
.with_spacing(8.)
.with_child(endpoint_name)
.with_child(
ConstrainedBox::new(endpoint_name)
.with_max_width(320.)
.finish(),
)
.with_child(chips)
.finish();

Expand Down
4 changes: 2 additions & 2 deletions app/src/settings_view/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ use warpui::elements::{
ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DispatchEventResult, Empty,
EventHandler, Expanded, Fill, Flex, MainAxisSize, OffsetPositioning, ParentAnchor,
ParentElement, ParentOffsetBounds, Radius, SavePosition, ScrollbarWidth, Shrinkable, Stack,
Text,
Text, Wrap,
};
use warpui::fonts::{Properties, Weight};
use warpui::keymap::{ContextPredicate, EnabledPredicate, FixedBinding};
Expand Down Expand Up @@ -203,7 +203,7 @@ pub(super) fn render_model_chips(
..Default::default()
};

let mut chips = Flex::row().with_spacing(8.);
let mut chips = Wrap::row().with_spacing(8.).with_run_spacing(8.);
for label in labels {
chips.add_child(Chip::new(label, chip_style).build().finish());
}
Expand Down
11 changes: 9 additions & 2 deletions app/src/settings_view/remove_custom_endpoint_confirmation_dialog.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
use warp_core::ui::theme::color::internal_colors;
use warpui::elements::{
Border, ChildView, Container, CornerRadius, Dismiss, Empty, Flex, ParentElement, Radius, Text,
Border, ChildView, ConstrainedBox, Container, CornerRadius, Dismiss, Empty, Flex,
ParentElement, Radius, Text,
};
use warpui::fonts::{Properties, Weight};
use warpui::text_layout::ClipConfig;
use warpui::ui_components::components::UiComponent;
use warpui::{
AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
Expand Down Expand Up @@ -106,6 +108,7 @@ impl View for RemoveCustomEndpointConfirmationDialog {
appearance.ui_font_family(),
appearance.ui_font_size(),
)
.with_clip(ClipConfig::ellipsis())
.with_style(Properties::default().weight(Weight::Semibold))
.with_color(theme.active_ui_text_color().into())
.finish();
Expand All @@ -119,7 +122,11 @@ impl View for RemoveCustomEndpointConfirmationDialog {
let endpoint_card = Container::new(
Flex::column()
.with_spacing(8.)
.with_child(endpoint_title)
.with_child(
ConstrainedBox::new(endpoint_title)
.with_max_width(360.)
.finish(),
)
.with_child(chips)
.finish(),
)
Expand Down