Mikayla
8d57d6ca6f
Merge branch 'main' into terminal-element
2023-12-05 09:33:46 -08:00
Kirill Bulatov
16b5d4b35c
Port to gpui2
2023-12-05 16:13:39 +02:00
Conrad Irwin
1c9b984738
Remove cx param
2023-12-04 23:35:31 +00:00
Mikayla
fe83919746
Get terminal turning on
2023-12-01 17:01:57 -08:00
Mikayla
b0f9144167
Compiling layout!
...
co-authored-by: Max <max@zed.dev>
2023-12-01 16:21:12 -08:00
Mikayla
39887be7d0
WIP: layout compiling
2023-11-30 11:01:36 -08:00
Max Brunsfeld
6bf7ad71eb
Show action key bindings in context menus
2023-11-28 16:07:42 -08:00
Kirill Bulatov
cd4ea344a6
Slightly less errors in terminal_element2
2023-11-27 16:55:48 +02:00
Marshall Bowers
031fca4105
Simplify ContextMenu by not storing list components
2023-11-22 12:41:29 -05:00
Piotr Osiewicz
54a3b56935
Merge remote-tracking branch 'origin/callback-handles' into search2
2023-11-21 00:40:20 +01:00
Conrad Irwin
8049ec674e
Fix last thing
2023-11-20 16:35:56 -07:00
Conrad Irwin
3e2dba36b4
Merge branch 'main' into callback-handles
2023-11-20 16:28:35 -07:00
Mikayla
2c4d83c9af
WIP
...
co-authored-by: conrad <conrad@zed.dev>
co-authored-by: Nathan <nathan@zed.dev>
2023-11-20 14:46:01 -08:00
Marshall Bowers
652e3b0bb6
Rename ListEntry to ListItem ( #3371 )
...
This PR renames the `ListEntry` component to `ListItem` to better
reflect its intent.
Release Notes:
- N/A
2023-11-20 16:13:06 -05:00
Marshall Bowers
eb307b22f0
Rework List to use children ( #3369 )
...
This PR reworks the `List` component to use `children` instead of
accepting a `Vec<ListItem>` in its constructor.
This is a step towards making the `List` component more open.
Release Notes:
- N/A
2023-11-20 14:58:31 -05:00
Piotr Osiewicz
d60855b06d
Merge branch 'main' into search2
2023-11-20 19:23:35 +01:00
Piotr Osiewicz
07cc5904f8
Merge branch 'main' into search2
2023-11-20 18:37:41 +01:00
Conrad Irwin
8599ba557d
Fix more import errors
2023-11-20 10:01:21 -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
Nathan Sobo
33cd6f520a
Clean compile with redesigned element traits
2023-11-18 21:51:47 -07:00
Nathan Sobo
adc355a1e6
Element refinement passing on ui2
2023-11-18 20:05:47 -07:00
Conrad Irwin
a6d6f8a193
shhh ( #3358 )
...
- Fix image errors
Release Notes:
- N/A
2023-11-17 14:01:44 -07:00
Conrad Irwin
6bfe6fa0e1
Fix image errors
...
* Firstly only log one error per image load, not per frame
* Secondly use an Icon not an image for rendering Icons
2023-11-17 13:47:07 -07:00
Conrad Irwin
624bd0a05a
Collab ui2 ( #3357 )
...
* Clickable context menus & movable panels – what will they think of
next?!
Release Notes:
- N/A
2023-11-17 13:33:18 -07:00
Conrad Irwin
eb04160d2d
Dock menu
2023-11-17 12:14:06 -07:00
Piotr Osiewicz
dca2dc7b6b
Merge branch 'main' into search2
2023-11-17 13:22:30 +01:00
Mikayla
1693718637
Merge branch 'main' into saving-2
2023-11-16 23:11:38 -08:00
Mikayla
9a3cd073c7
Restore a bunch of random workspace stuff
2023-11-16 23:05:28 -08:00
Conrad Irwin
6d4276ea5f
Merge branch 'main' into collab_ui2
2023-11-16 22:08:42 -07:00
Conrad Irwin
c0ad15756c
More attachment configuration for context menus
2023-11-16 21:59:23 -07:00
Mikayla
4de2c0f7ef
Re-implement actions as derive macros instead of blanket impls
2023-11-16 17:32:02 -08:00
Conrad Irwin
074a221e0f
Progress on ContextMenu
2023-11-16 16:59:27 -07:00
Marshall Bowers
b559bfd80f
Parameterize theme2::init to allow loading just the base theme ( #3345 )
...
This PR adds a parameter to the `theme2::init` method to indicate what
the theme-loading behavior should be.
This allows us to indicate when we want to load all of the additional
built-in user themes (like in the Zed binary and in the storybook), and
when we don't want to load the user themes (like in tests).
We're using an enum over just a `bool` here for clarity at the call
site.
Release Notes:
- N/A
2023-11-16 13:03:30 -05:00
Piotr Osiewicz
f8b91bd0f0
Fix some of the warnings
2023-11-16 18:36:19 +01:00
Kirill Bulatov
ab0a3f19ab
Add an actual context menu into terminal-2
...
(click the text, not the pane!)
Co-Authored-By: Piotr <piotr@zed.dev>
2023-11-16 16:36:44 +02:00
Kirill Bulatov
f638d4ce1d
Add basic context menu element
2023-11-16 14:35:13 +02:00
Kirill Bulatov
0f0b7090b8
Fix more errors in terminal element
2023-11-16 13:10:43 +02:00
Kirill Bulatov
fd61683c46
WIP
2023-11-16 10:40:02 +02:00
Kirill Bulatov
e3465fbcf9
Comment out the terminal view
2023-11-16 10:04:20 +02:00
Kirill Bulatov
a238368296
More compilation fixes
2023-11-16 10:04:18 +02:00
Kirill Bulatov
61d6cb880c
Start porting terminal_element to gpui2
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-11-16 10:04:03 +02:00
Kirill Bulatov
d89c51135a
Start porting terminal_view to gpui2
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-11-16 10:04:03 +02:00
