Commit Graph
25009 Commits
Author SHA1 Message Date
Antonio ScandurraandNathan 0a7984edc6 Don't panic when trying to reuse an existing workspace
Co-Authored-By: Nathan <nathan@zed.dev>
2023-12-07 17:53:07 +01:00
Piotr Osiewicz dab0e2b6b4 Render multibuffer 2023-12-07 17:48:53 +01:00
Antonio ScandurraandNathan 7356b18452 Fix clipping when rendering paths
Co-Authored-By: Nathan <nathan@zed.dev>
2023-12-07 17:48:00 +01:00
Nate Butler b616789646 WIP
[no-ci]
2023-12-07 10:50:07 -05:00
Piotr Osiewicz 5a6e26628c Searches work, but the results are not displayed 2023-12-07 16:43:34 +01:00
Piotr Osiewicz 4f7cb770e0 WIP, search bar looks kinda okay 2023-12-07 16:26:40 +01:00
Kirill Bulatov 7f72ad9a36 Fix more bugs around terminal2 and focus (#3534) 2023-12-07 16:52:59 +02:00
Kirill Bulatov 1df838c88d Add initial OS file drag and drop support 2023-12-07 16:08:48 +02:00
Kirill Bulatov e21e3e4f3b Activate Zed window on external file drop 2023-12-07 16:08:47 +02:00
Kirill Bulatov e4b11bdee6 Do not expand terminal selections on active drag 2023-12-07 16:08:47 +02:00
Kirill Bulatov 25243121af Convert OS file drag and drop enter event into a mouse move, not mouse click 2023-12-07 16:08:47 +02:00
Kirill Bulatov eb5349ce5b Suppress unused variable r-a warning from action derive procmacro 2023-12-07 16:08:47 +02:00
Kirill Bulatov a6d6160268 Move actions to namespaces used in zed1 keybinding settings 2023-12-07 16:08:47 +02:00
Kirill Bulatov 615b2dc06d Do not panic when focusing empty dock 2023-12-07 16:08:47 +02:00
Piotr Osiewicz 95814ab53b Barebones project search (no UI, but the crate compiles) 2023-12-07 14:36:45 +01:00
Piotr Osiewicz 182ea495bf Search2 fixups (#3533)
Fixes several issues with focus and unbound actions.
Release Notes:

- N/A
2023-12-07 14:01:21 +01:00
Piotr Osiewicz 6528d8e87f Remove unused import 2023-12-07 13:54:51 +01:00
Antonio Scandurra a4fc07f6aa Fix confirming rename not working on editor2 (#3532)
Release Notes:

- N/A
2023-12-07 13:20:00 +01:00
Piotr Osiewicz 5c5d6cdcf6 fixup! buffer search: Fix up rough edges 2023-12-07 13:13:38 +01:00
Antonio Scandurra 67a00e0920 Fix confirming rename not working on editor2 2023-12-07 12:54:28 +01:00
Piotr Osiewicz 307a3d1ae2 buffer search: Fix up rough edges
Focus query editor when Deploy::focused is true, add missing bindings
2023-12-07 12:52:34 +01:00
Antonio Scandurra b47d63b9cd Rework frame rendering (#3531)
This pull request replaces the old `previous_frame` and `current_frame`
with a new pair of `rendered_frame` and `next_frame` that are swapped
once we are ready to draw a finished frame.

This makes it clearer when to use which: `rendered_frame` should be used
to query the existing state, whereas `next_frame` should be used and
mutated when redrawing a dirty window.

The change was prompted by a bug I encountered in
`FocusHandle::contains`. The implementation was reading `current_frame`,
but that was the wrong field to access if e.g. we were reading it inside
of a `render` function or any other time while drawing the window.

Release Notes:

- N/A
2023-12-07 12:36:06 +01:00
Antonio Scandurra 732cf038c0 Polish assistant in zed2 (#3530)
This fixes a few bugs that remained after merging #3513 

Release Notes:

- N/A
2023-12-07 12:16:39 +01:00
Antonio Scandurra fa96a6e5a8 Rework frame rendering
This commit replaces the old `previous_frame` and `current_frame` with
a new pair of `rendered_frame` and `next_frame` that are swapped once
we are ready to draw a finished frame.

This makes it clearer when to use which: `rendered_frame` should be used
to query the existing state, whereas `next_frame` should be used and mutated when
redrawing a dirty window.

The change was prompted by a bug I encountered in `FocusHandle::contains`. The
implementation was reading `current_frame`, but that was the wrong field to
access if e.g. we were reading it inside of a `render` function or any other
time while drawing the window.
2023-12-07 12:10:49 +01:00
Antonio Scandurra 75c456997f Use the correct icons in AssistantPanel header 2023-12-07 10:53:24 +01:00
Antonio Scandurra 0ab459a950 Simplify focus management in AssistantPanel 2023-12-07 10:38:00 +01:00
Antonio Scandurra 070da1be20 Ensure editor gets focused when selecting conversation 2023-12-07 10:27:25 +01:00
Federico Dionisi 5b796d32d0 Dismiss theme_selector on esc (#3502) 2023-12-07 09:07:13 +01:00
Nate Butler 5f4e9710ab WIP 2023-12-07 01:46:28 -05:00
Nate Butler 240e8cc12e Add row-reverse and col-reverse to styled 2023-12-07 01:17:18 -05:00
Nate Butler 20cfbb2abe checkpoint 2023-12-07 00:33:24 -05:00
Nate Butler 964d226a7b Update pickers (#3529)
[[PR Description]]

- Update the size of all pickers
- Additional styling fixes for File Finder and Outline palettes
- Extend the ui prelude to include common imports

Release Notes:

- N/A
2023-12-07 00:24:46 -05:00
Nate Butler a97c62181f Fix incorrect text style in outline palette, use background highlights for matches 2023-12-07 00:16:24 -05:00
Nate Butler 9136216071 add color_alpha function 2023-12-07 00:15:43 -05:00
Joseph T. Lyons df84b9d94e Remove remnants from conflict resolution (#3528)
Fixes a couple of things that slipped through when going through the
last merge conflict

Release Notes:

- N/A
2023-12-06 23:44:49 -05:00
Nate Butler 6f5d8dbc4a Update pickers to have a consistently larger size 2023-12-06 23:38:47 -05:00
Joseph T. Lyons e02c56d636 Feedback 2 (#3527)
Ports feedback crate over to zed2. Introduces modal feedback. Feedback
submission works, but there are some TODOs in the code for things that
need to be done (needs a UI pass, dismissing the modal in certain cases,
etc), but I might merge this to reduce chances of conflicts (aleady had
to deal with a few).

<img width="1378" alt="SCR-20231206-udgp"
src="https://github.com/zed-industries/zed/assets/19867440/99f9e843-ac9c-4df1-b600-2522863e6459">

Release Notes:

- N/A
2023-12-06 23:25:45 -05:00
Nate Butler facda33434 Merge branch 'main' into update-pickers 2023-12-06 23:21:42 -05:00
Joseph T. Lyons 263b79c047 Merge branch 'main' into feedback-2 2023-12-06 23:16:54 -05:00
Joseph T. Lyons 853da8eaa6 WIP 2023-12-06 23:15:04 -05:00
Joseph T. Lyons 5ecc231919 Use when_else() 2023-12-06 22:34:28 -05:00
Joseph T. Lyons 91bda75cb3 Introduce when_else() 2023-12-06 22:34:14 -05:00
Joseph T. Lyons 582f01ef1d Renove unused code 2023-12-06 21:32:33 -05:00
Joseph T. Lyons 2a3a77d254 Improve character limit bounds indicator 2023-12-06 21:23:51 -05:00
Mikayla Maki 4de80c8b70 Terminal2 (#3449)
Release Notes:

-
2023-12-06 16:49:46 -08:00
Joseph T. Lyons f1831d0e6d Highlight whole modal as needing UI tweaks 2023-12-06 19:35:41 -05:00
Mikayla 21b244b391 Fix selection backgrounds 2023-12-06 16:31:28 -08:00
Joseph T. Lyons 149a82ff94 Remove email address from local database if user removes it 2023-12-06 19:26:25 -05:00
Mikayla 4c4adf271e Tear out drag event listener 2023-12-06 16:22:25 -08:00
Joseph T. Lyons fa713eba9b Start work to add a confirmation when exiting feedback containing text 2023-12-06 19:13:38 -05:00