Marshall Bowers
8f1c74b8bc
Factor out LabelLike to share common label styles ( #3510 )
...
This PR factors out a new `LabelLike` component to share common styles
between the `Label` and `HighlightedLabel` components.
Release Notes:
- N/A
2023-12-06 11:17:12 -05:00
Nate Butler
0ced310f93
Merge branch 'main' into update-pickers
2023-12-06 11:10:30 -05:00
Nate Butler
74e3b12a26
Update file finder style
2023-12-06 11:10:27 -05:00
Nate Butler
cf971f706c
Extend ui prelude
2023-12-06 11:07:46 -05:00
Nate Butler
b5c790ed29
WIP update picker style
2023-12-06 11:01:22 -05:00
Piotr Osiewicz and Antonio
6549a9a091
Let WindowContext::dispatch_action handle global actions
...
Co-authored-by: Antonio <antonio@zed.dev >
2023-12-06 16:52:52 +01:00
Nate Butler
3b8c566f31
Merge branch 'main' into update-pickers
2023-12-06 10:48:50 -05:00
Marshall Bowers
f833cd7c16
Use specified color for non-highlighted text in HighlightedLabel ( #3509 )
...
This PR fixes an issue where the specified color for a
`HighlightedLabel` was not respected as the default color for
non-highlighted text.
Release Notes:
- N/A
2023-12-06 10:41:49 -05:00
Piotr Osiewicz
e9002ab10a
Merge branch 'main' into app-menus
2023-12-06 16:34:55 +01:00
Antonio Scandurra
a1c8f01ff3
WIP
2023-12-06 16:34:07 +01:00
Antonio Scandurra
54ea7257ff
Copilot2 ( #3498 )
...
Add hidden_action_types to CommandPaletteFilter.
WindowContext.available_actions now returns global actions as well.
Release Notes:
- N/A
2023-12-06 16:31:30 +01:00
Piotr Osiewicz and Antonio
d09dfe01f5
Wire up global actions
...
Added an ephemeral root node so that even if there's no window/focused handle we still have something to dispatch to.
Co-authored-by: Antonio <antonio@zed.dev >
2023-12-06 16:15:53 +01:00
Kirill Bulatov
3c1bf0260c
Disable bundling for main commits ( #3508 )
...
(in the first commit, this PR autoformats both yaml files with Zed's
default prettier, to be able to edit those in prettier from now on)
Bundling is a relatively long procedure, and now we have nightly builds
for zed2 (with their own lifecycle, CI file and tag for triggering it
from non-main branch).
Hence, bundling zed1 and/or zed2 by default looks wasteful and
unnecessary, disable them by default.
There's still a `run-build-dmg` label that enables bundling for any PR
needed, and a `startsWith(github.ref, 'refs/tags/v')` check in the CI
run to keep the releases working.
Release Notes:
- N/A
2023-12-06 17:08:48 +02:00
Nate Butler
cb0880cf3c
Add debugging colors to styled_ext
2023-12-06 10:08:26 -05:00
Kirill Bulatov
a58f393458
Do not bundle Zed on main branch commits
2023-12-06 16:58:49 +02:00
Kirill Bulatov
0ef97edd6e
Format the CI file with Zed's default prettier
2023-12-06 16:58:18 +02:00
Piotr Osiewicz
1f538c5fdd
Merge branch 'main' into copilot2
2023-12-06 15:13:13 +01:00
Antonio Scandurra
5f172a52a4
Load assistant panel
2023-12-06 14:23:05 +01:00
Piotr Osiewicz
1b0ec82caa
Remove old UI code, remove dbg!
2023-12-06 14:16:19 +01:00
Piotr Osiewicz
7998e8281c
Barebones Copilot prompt
...
Filter out sign in/sign out when user is signed in/not signed in
2023-12-06 14:14:18 +01:00
Piotr Osiewicz
3f9fe58c48
Signed out state is looking good
2023-12-06 13:00:57 +01:00
Antonio Scandurra
9eb98122ec
Merge remote-tracking branch 'origin/main' into assistant-2
2023-12-06 12:53:02 +01:00
Antonio Scandurra
1de02cf6e5
Start wiring up assistant2
2023-12-06 12:51:25 +01:00
Antonio Scandurra
b29cea287b
WIP
2023-12-06 12:12:28 +01:00
Mikayla
735f2029e9
Add more debugging
2023-12-05 17:31:33 -08:00
Marshall Bowers
5660c8f655
Add missing semicolon
2023-12-05 20:24:43 -05:00
Marshall Bowers
ed31d36ac1
Wire up NewWindow action
2023-12-05 20:24:01 -05:00
Marshall Bowers
d8757845a9
Wire up NewFile action
2023-12-05 20:21:35 -05:00
Mikayla
2ee0ecb677
Add back the main structure
2023-12-05 16:52:29 -08:00
Nathan Sobo
d2fe9f8f9b
Merge remote-tracking branch 'origin/main' into app-menus
2023-12-05 16:54:38 -07:00
Nathan Sobo
c9dd6b879c
Fix cmd-n in the project panel context menu and bind global workspace actions ( #3491 )
...
This PR binds the `workspace::NewFile` action only in the `Workspace`
context. It previously was bound globally, which caused us to hijack the
`cmd-n` binding when the context menu was visible in the project panel.
In the process, we also added some other global workspace actions and
move some other global bindings to be bound only on `Pane` and
`Workspace`.
Release Notes:
- N/A
2023-12-05 16:52:39 -07:00
Nathan Sobo and Marshall
65bb05af4c
Merge main
...
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-05 16:47:13 -07:00
Nathan Sobo and Marshall
82534b6612
Get app menus basically working
...
- Everything is still disabled when there is no active window.
Co-Authored-By: Marshall <marshall@zed.dev >
2023-12-05 16:37:01 -07:00
79567d1c87
Add AppContext::dispatch_action and use it for app menu actions
...
Co-Authored-By: Marshall <marshall@zed.dev >
Co-Authored-By: Julia <julia@zed.dev >
2023-12-05 15:49:06 -07:00
Max Brunsfeld
5b6fd3ac1d
Implement following and more collaboration panel features in zed2 ( #3504 )
2023-12-05 13:59:15 -08:00
Joseph T. Lyons
a27db35ff7
temp
2023-12-05 16:37:43 -05:00
Marshall Bowers and Nate Butler
02e507b973
Update breadcrumb rendering ( #3505 )
...
This PR updates the rendering of the breadcrumb.
Release Notes:
- N/A
Co-authored-by: Nate Butler <iamnbutler@gmail.com >
2023-12-05 16:34:21 -05:00
Max Brunsfeld
f2faa70f73
Make Window::on_next_frame work in tests
2023-12-05 13:34:12 -08:00
Max Brunsfeld
863222edc5
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
fdc2d7ce42
Remove unused code
2023-12-05 15:53:52 -05:00
Joseph T. Lyons
dec4cfa0b4
Implement feedback action
...
OpenZedCommunityRepo
2023-12-05 15:52:02 -05:00
Joseph T. Lyons
78e1c0f9c3
Implement feedback actions
...
CopySystemSpecsIntoClipboard
RequestFeature
FileBugReport
2023-12-05 15:48:41 -05:00
Nathan Sobo
631e264e3c
Start on app menus
2023-12-05 13:17:59 -07:00
Mikayla
ab140ee4c2
Add event based drag API to GPUI, continue binding mouse handlers to terminal
2023-12-05 12:07:17 -08:00
Marshall Bowers
fc9b662042
Update Tab Bar & Toolbar ( #3503 )
...
- Work on default light theme
- Update tab bar and tabs
- Port quick_action_bar crate to zed2
- Add `Indicator` component
- Add `v_stack` & `h_stack` to ui::prelude::*
Release Notes:
- N/A
2023-12-05 14:23:13 -05:00
Marshall Bowers
8141f4fd86
Format code
2023-12-05 14:17:22 -05:00
Marshall Bowers
e0ca7f844a
Merge branch 'main' into pane-toolbar-tabbar-ui
2023-12-05 14:15:18 -05:00
Nate Butler and Marshall Bowers
4c4b235b13
make ci happy
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-12-05 14:09:42 -05:00
Nate Butler and Marshall Bowers
dc7e4a4b17
Remove debugging colors
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-12-05 14:09:29 -05:00
Nate Butler and Marshall Bowers
27703a3279
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