zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

assistant panel: Make configuration view scrollable (#16022)

Browse Source 
We had to resort to this "hack" to get it to work, since nothing else we
tried (changing the `Pane`, changing the `ConfigurationView`, changing
the `AssistantPanel`, ...) worked.

Release Notes:

- N/A

Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Bennet <bennet@zed.dev>
This commit is contained in:
Thorsten Ball 2024-08-09 12:21:22 +02:00 committed by GitHub
parent e783142528
commit 173f6e7c8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
crates/assistant/src/assistant_panel.rs
View File

@ -32,12 +32,12 @@ use editor::{
use editor::{display_map::CreaseId, FoldPlaceholder}; use editor::{display_map::CreaseId, FoldPlaceholder};
use fs::Fs; use fs::Fs;
use gpui::{ use gpui::{
div, percentage, point, Action, Animation, AnimationExt, AnyElement, AnyView, AppContext, canvas, div, percentage, point, Action, Animation, AnimationExt, AnyElement, AnyView,
AsyncWindowContext, ClipboardItem, Context as _, DismissEvent, Empty, Entity, EntityId, AppContext, AsyncWindowContext, ClipboardItem, Context as _, DismissEvent, Empty, Entity,
EventEmitter, FocusHandle, FocusableView, FontWeight, InteractiveElement, IntoElement, Model, EntityId, EventEmitter, FocusHandle, FocusableView, FontWeight, InteractiveElement,
ParentElement, Pixels, ReadGlobal, Render, SharedString, StatefulInteractiveElement, Styled, IntoElement, Model, ParentElement, Pixels, ReadGlobal, Render, SharedString,
Subscription, Task, Transformation, UpdateGlobal, View, ViewContext, VisualContext, WeakView, StatefulInteractiveElement, Styled, Subscription, Task, Transformation, UpdateGlobal, View,
WindowContext, ViewContext, VisualContext, WeakView, WindowContext,
}; };
use indexed_docs::IndexedDocsStore; use indexed_docs::IndexedDocsStore;
use language::{ use language::{
@ -3945,7 +3945,7 @@ impl Render for ConfigurationView {
.map(|provider| self.render_provider_view(&provider, cx)) .map(|provider| self.render_provider_view(&provider, cx))
.collect::<Vec<_>>(); .collect::<Vec<_>>();
v_flex() let mut element = v_flex()
.id("assistant-configuration-view") .id("assistant-configuration-view")
.track_focus(&self.focus_handle) .track_focus(&self.focus_handle)
.bg(cx.theme().colors().editor_background) .bg(cx.theme().colors().editor_background)
@ -3970,9 +3970,24 @@ impl Render for ConfigurationView {
.p(Spacing::XXLarge.rems(cx)) .p(Spacing::XXLarge.rems(cx))
.mt_1() .mt_1()
.gap_6() .gap_6()
.size_full() .flex_1()
.children(provider_views), .children(provider_views),
) )
.into_any();
// We use a canvas here to get scrolling to work in the ConfigurationView. It's a workaround
// because we couldn't the element to take up the size of the parent.
canvas(
move |bounds, cx| {
element.prepaint_as_root(bounds.origin, bounds.size.into(), cx);
element
},
|_, mut element, cx| {
element.paint(cx);
},
)
.flex_1()
.w_full()
} }
} }