 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 |
|
 Mikayla
|
6e84d8fbc0
|
Merge branch 'main' into panic-hunting
|
2023-11-22 13:47:17 -08:00 |
|
 Nathan Sobo
|
c23f17ee0b
|
Reorganize element-related traits
|
2023-11-22 11:19:43 -07:00 |
|
 Marshall Bowers
|
031fca4105
|
Simplify ContextMenu by not storing list components
|
2023-11-22 12:41:29 -05:00 |
|
|
Mikaylaandnathan
|
469b05684f
|
Fix a few identity mixups in GPUI
co-authored-by: nathan <nathan@zed.dev>
|
2023-11-21 17:12:32 -08:00 |
|
 Conrad Irwin
|
8049ec674e
|
Fix last thing
|
2023-11-20 16:35:56 -07:00 |
|
|
2c4d83c9af
|
WIP
co-authored-by: conrad <conrad@zed.dev>
co-authored-by: Nathan <nathan@zed.dev>
|
2023-11-20 14:46:01 -08: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
|
0673606de8
|
WIP
|
2023-11-18 20:22:43 -07:00 |
|
|
Nathan Sobo
|
adc355a1e6
|
Element refinement passing on ui2
|
2023-11-18 20:05:47 -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
|
ceb20dea96
|
Refactorings
|
2023-11-17 13:23:12 -07:00 |
|
|
Conrad Irwin
|
eb04160d2d
|
Dock menu
|
2023-11-17 12:14:06 -07: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 |
|
|
Conrad Irwin
|
074a221e0f
|
Progress on ContextMenu
|
2023-11-16 16:59:27 -07:00 |
|
 Nate Butler
|
3223e21d9f
|
Add dock borders
|
2023-11-16 16:17:17 -05:00 |
|
|
Conrad Irwin
|
267e07472d
|
Checkpoint, MenuHandle can open one
|
2023-11-16 13:32:19 -07:00 |
|
|
Conrad Irwin
|
4540f04dbe
|
Add more detail to panel switcher interaction
|
2023-11-16 09:57:59 -07:00 |
|
|
Mikayla
|
9da0b78ead
|
Merge branch 'main' into tabs-n-splits
|
2023-11-15 23:41:25 -08:00 |
|
|
Conrad Irwin
|
0a9fb3978b
|
Enable panel switching
|
2023-11-15 21:01:00 -07:00 |
|
|
Mikayla
|
78cea69172
|
Add focusable view and restore workspace deserialization. Partially restore split and tab functions
|
2023-11-15 16:36:43 -08:00 |
|
|
Mikayla
|
7f72df6dcf
|
Merge branch 'main' into element-types
|
2023-11-14 15:49:10 -08:00 |
|
|
Nate Butler
|
008655b879
|
Set Pane Size
|
2023-11-14 16:47:52 -05:00 |
|
|
Conrad Irwin
|
5dda105182
|
Merge branch 'main' into element-types
|
2023-11-14 11:45:19 -07:00 |
|
|
Nathan Sobo
|
6abaacc457
|
Fix formatting
|
2023-11-14 01:58:10 -07:00 |
|
|
Nathan Sobo
|
c6e8a097a3
|
Rename back to div
|
2023-11-14 01:41:55 -07:00 |
|
|
Nathan Sobo
|
27fb381cca
|
Checkpoint
|
2023-11-14 01:15:48 -07:00 |
|
  
|
13dd912817
|
Get left, right, and bottom docks rendering in the right places in the workspace
Co-authored-by: Julia <julia@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
|
2023-11-13 10:47:15 -08:00 |
|
|
Mikayla
|
13255ef133
|
Poke at getting the project panel showing up
|
2023-11-12 23:22:02 -08:00 |
|
|
Mikayla
|
2c67cc80ba
|
Merge branch 'main' into event-emitter
|
2023-11-08 20:10:38 -08:00 |
|
|
Mikayla
|
a97c8bf58f
|
Get workspace compiling with new event emitters
|
2023-11-08 19:29:00 -08:00 |
|
|
Conrad Irwin
|
1b9f76c01d
|
Refactor GoToLine to use cx.observe_new_views()
|
2023-11-08 16:23:05 -07:00 |
|
 Kirill Bulatov
|
1a0cd3e09b
|
Remove and add more todosmerge .
|
2023-11-03 13:22:11 +02:00 |
|
|
Kirill Bulatov
|
eb8a0e7148
|
Uncomment persistence tests
|
2023-11-03 12:38:09 +02:00 |
|
|
Marshall Bowers
|
54969877a4
|
Make the Zed2 window movable (#3218)
This PR makes the Zed2 window movable and fixes a crash related to a
`todo!()` that wasn't necessary.
Release Notes:
- N/A
|
2023-11-02 16:17:31 -04:00 |
|
|
Conrad Irwin
|
5a41eed120
|
WIP
|
2023-11-02 11:34:31 -06:00 |
|
|
Conrad IrwinandAntonio
|
8f0f5a9ba1
|
Render status bar
Co-Authored-By: Antonio <me@as-cii.com>
|
2023-11-02 11:18:11 -06:00 |
|
|
Nathan Sobo
|
52e195b47c
|
WIP
|
2023-11-02 07:46:49 -06:00 |
|
|
Kirill Bulatov
|
73c97d0c10
|
WIP
Uncomment more methods in workspace2.rs
|
2023-11-01 14:47:29 +02:00 |
|
|
Antonio Scandurra
|
4d320f065e
|
WIP
|
2023-11-01 12:47:19 +01:00 |
|
 KCaverly
|
551171a339
|
Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace
|
2023-10-31 11:39:34 -04:00 |
|
|
KCaverly
|
663e8aed8a
|
wip progress
|
2023-10-31 10:49:51 -04:00 |
|
|
KCaverlyandKirill
|
8d0905e479
|
dock compiling with todos outstanding
Co-Authored-By: Kirill <kirill@zed.dev>
|
2023-10-31 09:25:36 -04:00 |
|
|
Antonio Scandurra
|
bbe2dd1f8f
|
WIP
|
2023-10-31 14:04:59 +01:00 |
|
|
Antonio Scandurra
|
c8b5b085f4
|
WIP
|
2023-10-26 12:27:20 +02:00 |
|