Antonio Scandurra
cc0bc444b1
Merge remote-tracking branch 'origin/main' into surfaces
...
# Conflicts:
# crates/ui2/src/components/avatar.rs
2023-11-30 10:48:20 +01:00
Conrad Irwin
02174084ca
Collab panel2: Now with scrolling and keyboard ( #3455 )
...
Also introducing: .track_scroll() for non-uniform lists.
Release Notes:
- N/A
2023-11-30 00:13:52 -07:00
Conrad Irwin
4fbbb28da2
Restore logical offset preservation behaviour
2023-11-29 23:51:31 -07:00
Conrad Irwin
54cfcef0aa
Keybaord shortcut context menu
2023-11-29 23:04:33 -07:00
Conrad Irwin
a37f86f294
Scroll the collab panel when keyboard focusing
2023-11-29 22:39:15 -07:00
Conrad Irwin
8638fc4149
Add a ScrollHandle to gpui2 for the collab panel
2023-11-29 22:20:06 -07:00
Max Brunsfeld
c95a7c7387
Address some TODOs in editor2 crate ( #3445 )
...
* Fix crash when jumping to definition
* Enabling resolution of completions
* Make links in interactive text clickable
* Enable code paths that use `select_anchors`
2023-11-29 16:32:02 -08:00
Max Brunsfeld
2bd428102b
Use pointer cursor style for clickable ranges in InteractiveText
2023-11-29 12:42:09 -08:00
Conrad Irwin and Max
7e5aa5ce77
More drag'n'drop fixes
...
Co-Authored-By: Max <max@zed.dev >
2023-11-29 12:35:25 -07:00
Antonio Scandurra
a4035f15af
WIP
2023-11-29 18:18:15 +01:00
Conrad Irwin
35481e2c79
Move padding on uniform list inside the scrollable area
2023-11-29 10:05:31 -07:00
Conrad Irwin
a761e6ca0e
More mouse occlusion work
2023-11-28 09:59:58 -07:00
Antonio Scandurra
3ac545088a
WIP: preserve aspect ratio of images
2023-11-28 17:33:11 +01:00
Antonio Scandurra and Julia
600b564bbf
Introduce surface rendering
...
Co-Authored-By: Julia <julia@zed.dev >
2023-11-28 16:47:31 +01:00
Conrad Irwin
ca0dcf741f
Use layers to correct mouse event handling too
2023-11-28 00:07:26 -07:00
Conrad Irwin
17b5f9294c
Fix hover state when element is occluded
2023-11-27 23:18:25 -07:00
Nate Butler
ca2052b0c1
Merge branch 'main' into completions-styles
2023-11-27 19:22:07 -05:00
Marshall Bowers
24f3034106
Add ListItem story ( #3411 )
...
This PR adds a story for the `ListItem` component, so we can work on it
in isolation.
Release Notes:
- N/A
2023-11-27 15:24:41 -05:00
Conrad Irwin
4f885252ab
[Zed2] Collab UI ( #3403 )
...
Release Notes:
- N/A
2023-11-27 12:40:59 -07:00
Marshall Bowers
feb7753a73
Fix typo in uniform_list's doc comment
2023-11-27 14:20:27 -05:00
Conrad Irwin
212d9254e1
Merge branch 'main' into completions-styles
2023-11-27 11:49:39 -07:00
Conrad Irwin
7a8aba329b
Break content mask for hoverables
2023-11-27 11:43:14 -07:00
Nate Butler
8a35a02863
Checkpoint - try using overlay for completions popover
...
[no ci]
2023-11-27 11:22:19 -05:00
Antonio Scandurra
682712f132
Account for previous line lengths when returning index
2023-11-24 18:32:48 +01:00
Antonio Scandurra
56d043f671
Allow finding which ranges were clicked on an InteractiveText
2023-11-23 18:08:49 +01:00
Piotr Osiewicz
390ecb5b0c
Merge branch 'main' into collab_ui-zed2
2023-11-23 15:02:55 +01:00
Piotr Osiewicz
c191943849
Add basic call/user UI in top-right corner.
...
Allow ui::Avatar to take custom data instead of always relying on URI resolution
2023-11-23 15:00:13 +01:00
Antonio Scandurra
3b918bfee8
Merge branch 'main' into rename-element-traits
...
# Conflicts:
# crates/gpui2/src/elements/uniform_list.rs
# crates/ui2/src/components/context_menu.rs
# crates/ui2/src/components/list.rs
2023-11-23 12:47:46 +01:00
Nathan Sobo
c23f17ee0b
Reorganize element-related traits
2023-11-22 11:19:43 -07:00
Antonio Scandurra
eaf90a4fbd
Fix drawing uniform list elements when scrolling
2023-11-22 18:32:02 +01:00
Antonio Scandurra
bd4a710cef
Use interactivity's base style for UniformList
2023-11-22 17:50:34 +01:00
Antonio Scandurra
2b6e8de11f
Don't perform wrapping in completions
2023-11-22 14:23:09 +01:00
Antonio Scandurra
fff2d7955e
Round up line width
2023-11-22 14:01:22 +01:00
Antonio Scandurra
3a8e9b5697
Avoid holding borrow to editor while painting child elements
2023-11-22 11:40:38 +01:00
2c4d83c9af
WIP
...
co-authored-by: conrad <conrad@zed.dev >
co-authored-by: Nathan <nathan@zed.dev >
2023-11-20 14:46:01 -08:00
Mikayla
6985b70859
fix gpui2
2023-11-20 11:55:27 -08:00
Conrad Irwin
25ed7c57c1
WIP
2023-11-20 12:34:08 -07:00
Conrad Irwin
d0dd44faad
Merge branch 'main' into callback-handles
2023-11-20 12:21:42 -07:00
Conrad Irwin
f86480ba5d
Merge followup mess
2023-11-20 09:58:05 -07:00
Conrad Irwin
0798cfd58c
Merge branch 'main' into derive-element-redux
2023-11-20 09:15:38 -07:00
Mikayla
88024ca7c9
Remove V parameter on elements
2023-11-19 18:32:31 -08:00
Conrad Irwin
c0d85dc1dd
Fix text wrapping when a child of a v_stack() ( #3362 )
...
Previously text that was rendered in a flex-column would reserve the
correct
amount of space during layout, and then paint itself incorrectly.
Release Notes:
- N/A
2023-11-19 11:37:31 -07:00
Conrad Irwin
0711121586
Add some test cases
2023-11-18 22:16:28 -07:00
Nathan Sobo
33cd6f520a
Clean compile with redesigned element traits
2023-11-18 21:51:47 -07:00
Conrad Irwin
cf47ed2c5f
Fix wrapping when parent has a max_width
...
(Also avoid re-wrapping text we already wrapped)
2023-11-18 21:31:16 -07:00
Conrad Irwin
7172ce37b1
Fix text wrapping when a child of a v_stack()
2023-11-18 20:35:22 -07:00
Nathan Sobo
adc355a1e6
Element refinement passing on ui2
2023-11-18 20:05:47 -07:00
Nathan Sobo
2515bbf990
Move self in Element::paint
...
Remove mutable state borrows in favor of state ownership in render processes to streamline element rendering.
2023-11-17 23:32:55 -07:00
Conrad Irwin
a6d6f8a193
shhh ( #3358 )
...
- Fix image errors
Release Notes:
- N/A
2023-11-17 14:01:44 -07:00
Nathan Sobo
c866c211b5
Make static str and SharedString implement Element
2023-11-17 13:48:01 -07:00