mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-18 08:02:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
15031 commits 509 branches 811 tags 218 MiB
Commit graph

548 commits

Author SHA1 Message Date
Conrad Irwin
7e5aa5ce77 More drag'n'drop fixes 
Co-Authored-By: Max <max@zed.dev>
 2023-11-29 12:35:25 -07:00
Conrad Irwin
e377bd805b Add channel drag'n'drop 
Co-Authored-By: Max <max@zed.dev>
 2023-11-29 12:24:04 -07:00
Max Brunsfeld
dbfc7d3555 Merge branch 'main' into project-panel-context-menu 2023-11-29 09:45:31 -08:00
Max Brunsfeld
233aac5573 Make DismissEvent a unit struct 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-29 09:42:54 -08:00
Max Brunsfeld
ac34229118 Add keyboard control over context menus 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-29 09:39:20 -08:00
Conrad Irwin
35481e2c79 Move padding on uniform list inside the scrollable area 2023-11-29 10:05:31 -07:00
Conrad Irwin
db5ded0252 Remove useless method 
We need to move state from layout to paint in any case
 2023-11-28 20:53:46 -07:00
Conrad Irwin
8d1518d70c Fix stateful elements in Components 
Previously a component assumed its element was stateless, this was
incorrect!
 2023-11-28 20:47:11 -07:00
Mikayla
a41c857855
Merge branch 'main' into welcome2 2023-11-28 15:38:51 -08:00
Conrad Irwin
a761e6ca0e More mouse occlusion work 2023-11-28 09:59:58 -07: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
Mikayla
8faa1f6e58
Merge branch 'main' into welcome 2023-11-27 18:55:23 -08:00
Conrad Irwin
ccfc4fc0b9
Fix esc in command palette (#3414) 
Also: add editor.register_action

Release Notes:

- N/A
 2023-11-27 15:47:01 -07:00
Conrad Irwin
47b4d9942f Fix panic on quit 2023-11-27 15:33:47 -07: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
7a8aba329b Break content mask for hoverables 2023-11-27 11:43:14 -07:00
Piotr Osiewicz
b2b5df4428 close notification handler proper on accept/decline 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-27 18:57:25 +01:00
Conrad Irwin
fd165206bf
gpui2: Notifications (#3407) 
Release Notes:

- N/A
 2023-11-27 09:22:31 -07:00
Conrad Irwin
039c933d8e gpui2: Notifications 2023-11-26 22:28:53 -07:00
Antonio Scandurra
682712f132 Account for previous line lengths when returning index 2023-11-24 18:32:48 +01:00
Antonio Scandurra
047cfe5108 Fix painting when underlines and quads appeared after a wrap boundary 2023-11-24 18:23:08 +01:00
Antonio Scandurra
f227c3284d Consume newline from run if it spans it 2023-11-24 17:53:48 +01:00
Antonio Scandurra
d31b53b912 Extract a gpui::combine_highlights function 2023-11-24 16:31:38 +01:00
Antonio Scandurra
bf39968105 Return TextRuns in combine_syntax_and_fuzzy_match_highlights 2023-11-24 13:00:20 +01:00
Antonio Scandurra
7eeb8078f6 Allow setting text background color via TextStyle 2023-11-23 19:22:18 +01:00
Antonio Scandurra
1ad22231d2 Allow providing a background color in a TextRun 2023-11-23 18:55:16 +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
Joseph T. Lyons
f33c0e80a6
Add app events (#3372) 
Adds app events (`first open` and `open`). For the time being, I'm
abandonding trying to add `close`, after running into many issues
trying. The code is in place for me to continue on that work, but at the
moment, we require having the telemetry settings in hand when calling
any of the methods that log an event, so we can honor the user's
preference for sending telemetry or not, but when running the
`on_app_close` method, to send off an app `close` event, the settings
are no longer available (probably the order of teardown?), which causes
some tests to end up failing. I'm not sure how to solve this. Maybe we
keep the settings on the telemetry struct and update it each time any
event is logged, then, on app shutdown, when logging the app `close`
event, we can use the stored version (idk).

Release Notes:

- N/A
 2023-11-22 23:16:28 -05:00
Mikayla
6e84d8fbc0
Merge branch 'main' into panic-hunting 2023-11-22 13:47:17 -08:00
Mikayla
eb74ad7caa
Fix failing test 2023-11-22 13:41:48 -08:00
Joseph T. Lyons
ee2b6834bd Revert "Convert telemetry into a model" 
This reverts commit 6e4268a471.
 2023-11-22 16:16:44 -05:00
Joseph T. Lyons
c86e99928b Merge branch 'main' into add-app-events 2023-11-22 16:16:11 -05:00
Joseph T. Lyons
6e4268a471 Convert telemetry into a model 
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-11-22 16:16:10 -05: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
Joseph T. Lyons
a4a1e6ba98 WIP 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-11-21 22:32:07 -05:00
Mikayla
469b05684f
Fix a few identity mixups in GPUI 
co-authored-by: nathan <nathan@zed.dev>
 2023-11-21 17:12:32 -08:00
Mikayla
663bbb06d9
WIP 2023-11-21 12:40:00 -08:00
Piotr Osiewicz
54a3b56935 Merge remote-tracking branch 'origin/callback-handles' into search2 2023-11-21 00:40:20 +01:00
Conrad Irwin
8b6b7e60be borrow less 2023-11-20 16:00:47 -07:00