Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15878 commits 1103 branches 1111 tags 398 MiB
Commit graph

72 commits

Author SHA1 Message Date
Marshall Bowers
ee509e043d
Rework ListItem and ListHeader to use slot-based APIs (#3635) 
This PR reworks the `ListItem` and `ListHeader` components to use
slot-based APIs, making them less opinionated about their contents.

Splitting this out of the collab UI styling PR so we can land it to
avoid conflicts.

Co-authored-by: Nate <nate@zed.dev>

Release Notes:

- N/A
 2023-12-13 16:08:31 -05:00
Kirill Bulatov
ca8e8d1065 Finish removing all dangerous focus APIs 2023-12-12 16:11:14 +02:00
Julia
79e6dedb7a Track focus shenanigans with context menu 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-12-08 13:49:42 -05:00
Conrad Irwin
9162f299a7 Fix project panel context menu 2023-12-05 00:41:00 +00:00
Conrad Irwin
1c9b984738 Remove cx param 2023-12-04 23:35:31 +00:00
Conrad Irwin
c82fea375d Dispatch actions on focused node 
Allows us to implement context menu matching nicely
 2023-12-04 22:58:04 +00:00
Conrad Irwin
1da18ebe9a copilot_menu2 (though only tested offling, which is insufficient) 2023-12-01 23:43:02 -07:00
Conrad Irwin
e1c8369b3d Rename menu_handle to right_click_menu and child to trigger 
This makes things more in-line with `popover_menu`.
 2023-11-30 16:39:43 -07:00
Marshall Bowers
c7b79c9aef Remove unnecessary constructor and Clone derives 2023-11-29 13:38:05 -05:00
Max Brunsfeld
233aac5573 Make DismissEvent a unit struct 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-29 09:42:54 -08:00
Max Brunsfeld
ac34229118 Add keyboard control over context menus 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-29 09:39:20 -08:00
Max Brunsfeld
77acba9e4c Right-align key bindings in context menus 
Remove extra div in `List` that prevented list items from
filling the available space.

Co-authored-by: Marshall <marshall@zed.dev>
 2023-11-28 17:23:49 -08:00
Max Brunsfeld
6bf7ad71eb Show action key bindings in context menus 2023-11-28 16:07:42 -08:00
Max Brunsfeld
bcf449d3fe Add a basic context menu to the project panel 2023-11-28 15:12:46 -08:00
Marshall Bowers
070674a4fd
ui2: Unsuppress and fix warnings (#3423) 
This PR unsupresses the warnings in `ui2` and summarily fixes them.

Release Notes:

- N/A
 2023-11-28 14:44:19 -05:00
Conrad Irwin
039c933d8e gpui2: Notifications 2023-11-26 22:28:53 -07:00
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
Nathan Sobo
c23f17ee0b Reorganize element-related traits 2023-11-22 11:19:43 -07:00
Marshall Bowers
fd5793ddec Use children for ListItems 2023-11-22 12:44:51 -05:00
Marshall Bowers
031fca4105 Simplify ContextMenu by not storing list components 2023-11-22 12:41:29 -05:00
Nate Butler
205607a9cd Clean out UI 2023-11-21 00:44:51 -05:00
Mikayla
a844bf7d41
Fix stories 
co-authored-by: Piotrek <piotr@zed.dev>
 2023-11-20 16:06:10 -08: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
Conrad Irwin
b19a6c0dcc Fix storybook2 2023-11-20 10:16:05 -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
Nathan Sobo
2515bbf990 Move self in Element::paint 
Remove mutable state borrows in favor of state ownership in render processes to streamline element rendering.
 2023-11-17 23:32:55 -07:00
Mikayla
149b9d1aa6
Merge branch 'main' into managed-view-adjustment 2023-11-17 12:40:44 -08:00
Conrad Irwin
eb04160d2d Dock menu 2023-11-17 12:14:06 -07:00
Conrad Irwin
9d742b90c3 Allow you to click on a context menu item 2023-11-17 11:57:51 -07:00
Mikayla
17d53d0e38
Rename again, add fun cx APIs using new traits 2023-11-17 10:06:41 -08:00
Mikayla
01d9d53f4a
Adjust the type arrangement on ManagedViews 2023-11-17 09:51:11 -08:00
Conrad Irwin
2d1d75f482 +ManagedView 
And some games with rust traits
 2023-11-16 23:02:10 -07:00
Conrad Irwin
2182cb2656 Ooh generics 2023-11-16 22:16:29 -07: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
9547e88d88 TEMP 2023-11-16 19:50:31 -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
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
Conrad Irwin
496518f3e8 Use gpui instead of gpui2 consistenytly 2023-11-06 11:50:33 -07:00
Marshall Bowers
bf80c1da5b
Rename fields in ThemeColors (#3242) 
This PR applies a number of field renames in the `ThemeColors` struct
from the `import-theme` branch.

This will help prevent this branch from diverging too far from `main`.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-06 11:53:27 -05:00
Nate Butler
b125cc279f Simplify toggle, do some reorganization 2023-11-04 11:24:31 -04:00
Marshall Bowers
18431051d9
Rework theme2 with new theme structure (#3194) 
This PR reworks the theme definition in the `theme2` crate to be based
off of the new theme work that @iamnbutler has been working on.

We're still developing the new theme system, but it is complete enough
that we can now load the default theme and use it to theme the storybook
(albeit with some further refining of the color palette required).

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Marshall Bowers <marshall@zed.dev>
 2023-10-31 22:23:00 -04:00
Max Brunsfeld
30dffbb409 Introduce a Render trait, make views implement it 
Don't pass a render function separately from the view.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Antonio <as-cii@zed.dev>
 2023-10-30 15:19:40 -07:00