Commit Graph
259 Commits
Author SHA1 Message Date
Kirill BulatovandPiotr 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 74afa62a55 Add Overlay component to gpui2 2023-11-15 23:00:36 -07:00
Conrad Irwin 0a9fb3978b Enable panel switching 2023-11-15 21:01:00 -07:00
Mikayla 7f72df6dcf Merge branch 'main' into element-types 2023-11-14 15:49:10 -08:00
Mikayla Maki df64a3c701 Not working yet file-finder2 (#3321)
Porting file_finder

Release Notes:

- N/A
2023-11-14 15:22:59 -08:00
Mikayla 6b25841e2a WIP 2023-11-14 14:48:34 -08:00
Marshall Bowers 22f024bd5f Use IconElement in project panel 2023-11-14 15:44:26 -05:00
Conrad Irwin 37d0b8424c Merge branch 'main' into element-types 2023-11-14 12:10:26 -07:00
Marshall Bowers 76c15229c1 Combine LabelColor and IconColor into TextColor 2023-11-14 13:48:01 -05:00
Conrad Irwin 5dda105182 Merge branch 'main' into element-types 2023-11-14 11:45:19 -07:00
Marshall Bowers dc56a7b12b Add LabelSize 2023-11-14 13:43:37 -05:00
Marshall Bowers 9d31523cf3 Rename keybinding method on PaletteItem to key_binding 2023-11-14 13:37:21 -05:00
Marshall Bowers 90d7033fd0 Pass KeyBindings to TextTooltips 2023-11-14 13:36:03 -05:00
Nate Butler 251b4640c6 Extend tooltip to take meta + kb 2023-11-14 12:59:53 -05:00
Antonio Scandurra 40c634e056 Merge remote-tracking branch 'origin/main' into editor2-blocks 2023-11-14 17:16:58 +01:00
Nate Butler 6b366c102e Allow a button to take a color (#3315)
[[PR Description]]
- Allows a button to take a color and resolve it into `IconColor` and
`LabelColor`
- Extend `IconColor` and `LabelColor` to allow them to take a
`Player(i)`
- `impl From<LabelColor> for IconColor`

Release Notes:

- N/A
2023-11-14 10:36:52 -05:00
Antonio ScandurraandJulia f9b9b7549f Render block elements
Co-Authored-By: Julia <julia@zed.dev>
2023-11-14 16:03:06 +01:00
Antonio Scandurra fc5ec47cc8 WIP 2023-11-14 14:48:59 +01:00
Nathan Sobo 6abaacc457 Fix formatting 2023-11-14 01:58:10 -07:00
Nathan Sobo 364e3e7de5 Merge remote-tracking branch 'origin/main' into element-types 2023-11-14 01:55:58 -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
Nathan Sobo 9382a304c4 Checkpoint 2023-11-13 23:03:14 -07:00
Conrad Irwin ad017a5df5 Allow clicking on commands in the command palette 2023-11-13 21:42:27 -07:00
Conrad Irwin c5878cbd5f Add Text::styled() and use it in command palette
Prevents jumping while typing
2023-11-13 19:53:55 -07:00
Nathan Sobo 76754c559c WIP 2023-11-13 18:18:25 -07:00
Nate Butler 38888696db Allow a button to take a color 2023-11-13 19:46:15 -05:00
Marshall Bowers 53117eb5e5 Merge branch 'main' into one-themes 2023-11-13 18:16:45 -05:00
Conrad Irwin 25bc898807 Add KeyBindings to CommandPalette 2023-11-13 15:40:49 -07:00
Nate Butler dd434588ee WIP 2023-11-13 17:38:44 -05:00
Marshall Bowers 3654dd8da0 Remove unnecessary map 2023-11-13 11:10:08 -05:00
Nate ButlerandMarshall Bowers 3d66ba35a3 Add ui::Divider component
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-10 16:12:32 -05:00
Nate ButlerandMarshall Bowers 5dca5caf9f Add elevation to StyledExt
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-10 16:12:14 -05:00
Antonio Scandurra a0987f1121 Merge remote-tracking branch 'origin/main' into code-actions-2 2023-11-10 11:01:23 +01:00
Antonio ScandurraandNathan 5d15886675 Render code actions indicator
Co-Authored-By: Nathan <nathan@zed.dev>
2023-11-09 18:43:26 +01:00
Nate Butler b5f60b7e50 Merge branch 'main' into update-workspace-styles 2023-11-09 00:38:06 -05:00
Conrad Irwin b90e34aeb2 go to line2 (#3261)
- MODAL
- center a div
- MOAR CODE
- Beautiful go to line modal


Release Notes:
- N/A
2023-11-08 17:16:00 -07:00
Nate Butler e505fb330c WIP 2023-11-08 16:43:32 -05:00
Nate ButlerandMarshall Bowers 9cc3ee9674 Update usages of text_size_* to text_ui in ui components
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-08 15:28:38 -05:00
Nate ButlerandMarshall Bowers f4abd95866 Remove the Stack trait, update StyledExt to include stacks
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-08 15:00:47 -05:00
Nate Butler cb830a4ce0 Remove unused code in avatar 2023-11-08 14:46:47 -05:00
Mikayla 409e17ad30 Merge branch 'main' into go-to-line2 2023-11-08 11:32:36 -08:00
Nate Butler 6ecf629c63 BROKEN: Checkpoint 2023-11-08 14:29:38 -05:00
Nate Butler 6e11044e9e add ui_text_size functions 2023-11-08 12:57:24 -05:00
Conrad Irwin ae2d0f1fa1 Merge branch 'main' into go-to-line3 2023-11-07 14:44:45 -07:00
Nate Butler 3a85beeaa5 center a div 2023-11-07 16:23:41 -05:00
Conrad Irwin acab2f9003 MODAL 2023-11-07 13:23:27 -07:00
Mikayla Maki a3bd04fed2 Merge branch 'main' into picker 2023-11-07 11:44:02 -08:00
Nate Butler 91f356a2f1 Begin documenting theme colors 2023-11-07 13:36:01 -05:00
Max Brunsfeld 69eb49a2ed Merge branch 'main' into picker 2023-11-07 09:34:57 -08:00