Commit Graph
327 Commits
Author SHA1 Message Date
Marshall Bowers 5982a32d51 Remove padding from ButtonSize::None (#3541)
This PR removes the padding from buttons when using `ButtonSize::None`.

This fixes the size of the tab close buttons.

Release Notes:

- N/A
2023-12-07 14:11:30 -05:00
Marshall Bowers 35efac9839 Extract Tab component (#3539)
This PR extracts a new `Tab` component from the tabs implementation in
the workspace.

This will allow us to reuse this component anywhere that we need to use
tabs.

Like our other newer components, the `Tab` component has a relatively
open API.

It accepts `children` (or `child`) as well as a `start_slot` and
`end_slot` to position content in the slots on either end of the
content. These slots also respect the `TabCloseSide` and will switch
positions based on this value.

<img width="763" alt="Screenshot 2023-12-07 at 12 19 42 PM"
src="https://github.com/zed-industries/zed/assets/1486634/78e4db6a-f807-431e-8777-f52f2631e6ed">

Release Notes:

- N/A
2023-12-07 12:30:43 -05:00
Antonio Scandurra 2e9699f466 Don't panic when trying to reuse an existing workspace (#3538)
Release Notes:

- N/A
2023-12-07 18:23:33 +01:00
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
Kirill Bulatov 615b2dc06d Do not panic when focusing empty dock 2023-12-07 16:08:47 +02: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
Joseph T. Lyons 263b79c047 Merge branch 'main' into feedback-2 2023-12-06 23:16:54 -05:00
Marshall Bowers d910bd55d4 Port recent_projects to Zed2 (#3525)
This PR ports the `recent_projects` crate to Zed2 (`recent_projects2`).

Absent from this PR is wiring up the "Recent Projects" item in the title
bar. We'll come back to that soon.

Release Notes:

- N/A
2023-12-06 18:41:50 -05:00
Max Brunsfeld c247a87491 Fix propagation of active item to followers
Enable channel buffer integration tests.
2023-12-06 12:18:48 -08:00
Antonio ScandurraandMarshall 4aab4c5411 Use a handler instead of an action for clicks
This prevents dispatching actions on buttons that were not the target of the click.

Co-Authored-By: Marshall <marshall@zed.dev>
2023-12-06 19:12:01 +01:00
Antonio Scandurra 4411c839cd Load assistant panel 2023-12-06 14:23:05 +01:00
Antonio Scandurra c9300e2384 Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Nathan SoboandMarshall 76e6f84910 Merge main
Co-Authored-By: Marshall <marshall@zed.dev>
2023-12-05 16:47:13 -07:00
Max Brunsfeld e903a96401 Implement following and more collaboration panel features in zed2 (#3504) 2023-12-05 13:59:15 -08:00
Max Brunsfeld d03a77bbf4 Get following working
Restore a single event type on Item trait, so that the workspace can
subscribe to it and handle following events.
2023-12-05 12:57:23 -08:00
Joseph T. Lyons be231c3efd Implement feedback actions
CopySystemSpecsIntoClipboard
RequestFeature
FileBugReport
2023-12-05 15:48:41 -05:00
Marshall Bowers 106c479785 Merge branch 'main' into pane-toolbar-tabbar-ui 2023-12-05 14:15:18 -05:00
Nate ButlerandMarshall Bowers 461e2c221a Remove debugging colors
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-05 14:09:29 -05:00
Nate ButlerandMarshall Bowers ef129b5512 Update tabs rendering, fix tab spacing bug
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-05 14:04:12 -05:00
Joseph T. Lyons 5bf1b4404a Merge branch 'main' into feedback-2 2023-12-05 12:49:48 -05:00
Nate Butler 1a83f0376b Update tab close button 2023-12-05 11:59:23 -05:00
Antonio Scandurra 6688546075 WIP 2023-12-05 16:49:36 +01:00
Nate Butler a463f6b8a7 Update button sizes 2023-12-05 10:11:18 -05:00
Antonio Scandurra 27fddff40a Port semantic_index to gpui2 (#3500)
Release Notes:

- N/A
2023-12-05 15:52:38 +01:00
Antonio ScandurraandJulia Risley e2f77c34f9 Port semantic_index to gpui2
Co-Authored-By: Julia Risley <julia@zed.dev>
2023-12-05 15:38:36 +01:00
Kirill Bulatov 5242f8031e Port to gpui2 2023-12-05 16:13:39 +02:00
Nate Butler f723a20bb8 Expand toolbar tools 2023-12-05 09:02:21 -05:00
Max Brunsfeld 63fa23813f Enable more collab UI features (#3496)
* Current Call section of the collab panel
* Improve the collab titlebar
* Add basic UI for following

Following only partially works, but the UI for following is now in
place.
2023-12-04 18:01:11 -08:00
Max BrunsfeldandNathan c90503de59 Start work on following in zed2
Co-authored-by: Nathan <nathan@zed.dev>
2023-12-04 17:51:53 -08:00
Nate Butler a412df61e0 Remove double first item border in tabs 2023-12-04 20:13:52 -05:00
Max BrunsfeldandNathan da74d47191 Allow joining remote projects in zed2
Co-authored-by: Nathan <nathan@zed.dev>
2023-12-04 17:06:08 -08:00
Max Brunsfeld 42aaec9d32 Revert "Decouple workspace from call (#3380)"
This reverts commit 2df0a46cbe, reversing
changes made to 2704b92d2e.

Also, adjust new code that was written using the "call handler".
2023-12-04 17:05:44 -08:00
Max BrunsfeldandNathan debcb52436 Start bringing back the current call section of the collab panel
Co-authored-by: Nathan <nathan@zed.dev>
2023-12-04 15:46:56 -08:00
Conrad Irwin 1f7391fd60 Remove cx param 2023-12-04 23:35:31 +00:00
Nate Butler ed019635f9 Draw border under tabs 2023-12-04 18:21:50 -05:00
Nate Butler c20de8223e Fix double border 2023-12-04 18:13:28 -05:00
Nate Butler 7989ec5072 Work on light theme, update tab 2023-12-04 17:54:37 -05:00
Nate ButlerandMarshall Bowers 5f90f74a45 Remove debug
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-04 11:32:14 -05:00
Nate Butler 66e53df7df Update toolbar left tool group 2023-12-04 11:14:59 -05:00
Nate Butler 1a4d8f1826 Prevent tab bar from growing in height when a tab is added 2023-12-04 09:24:08 -05:00
Nate Butler a7f3f63463 Update empty pane state 2023-12-04 09:13:00 -05:00
Conrad Irwin 3d93aa7421 copilot_menu2 (though only tested offling, which is insufficient) 2023-12-01 23:43:02 -07:00
Conrad Irwin 6025c88b72 Prevent languages showing in wrong order first 2023-12-01 21:26:23 -07:00
Conrad Irwin 94e188da8f Language Selector 2 working! 2023-12-01 21:23:20 -07:00
Nathan SoboandMax 6f7fe43d6f Bind CloseWindow and Open actions on workspace
Co-Authored-By: Max <max@zed.dev>
2023-12-01 16:17:48 -07:00
Nathan Sobo 908027088f Enable workspace::Open global action 2023-12-01 16:08:57 -07:00
Julia 6b15042433 Merge branch 'main' into zed2-breadcrumbs 2023-12-01 12:28:36 -05:00
Julia c4a1527a40 I'm a dunce 2023-12-01 11:47:04 -05:00
Julia 46e8e35f4d Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05:00
Nate Butler a24d4920fd Merge branch 'main' into collab-ui-refinement 2023-12-01 10:50:25 -05:00