Conrad Irwin
37d0b8424c
Merge branch 'main' into element-types
2023-11-14 12:10:26 -07:00
Marshall Bowers
5c8db996ee
Extend Label & Tooltip ( #3322 )
...
This PR extends the `Label` component with additional functionality,
partially for use in the `TextTooltip` component.
- [x] `Label` should take a `size` (`Default` & `Small` for now)
- These should use `text_ui` and `text_ui_sm`
- [x] Fold `LabelColor` and `IconColor` into one enum
- `TextColor`
- [x] `TextTooltip`'s keybinding field should take whatever we use for
keybindings instead of a string, and render the keybinding component
- [x] `TextTooltip` should use small `Label`s
Release Notes:
- N/A
2023-11-14 13:56:05 -05: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
Mikayla
27574524b8
Restore quit action
2023-11-14 10:31:55 -08:00
Conrad Irwin
b69b5742ed
Fix panicking unwrap()
2023-11-14 11:27:52 -07:00
Marshall Bowers
aa1471948f
Merge branch 'main' into extend-label-and-tooltip
2023-11-14 13:14:10 -05:00
Mikayla
caa0bae04f
Merge branch 'main' into core-actions
2023-11-14 10:11:39 -08:00
Nathan Sobo
bb584cc7c4
WIP
2023-11-14 11:00:52 -07:00
Nate Butler
251b4640c6
Extend tooltip to take meta + kb
2023-11-14 12:59:53 -05:00
Max Brunsfeld
c7d80c7aac
Start work on creating gpui2 version of project panel ( #3299 )
...
I'm gonna land what I have, even though some features aren't ported yet,
since we're working on all of this code so actively.
* [x] get the basic structure compiling
* [x] get the panel laying out correctly
* [ ] rename / new file editor
* [ ] enable the tests
* [ ] drag and drop
* [ ] context menu
2023-11-14 09:56:46 -08:00
Max Brunsfeld
2c3c238c9d
Fix warnings
2023-11-14 09:47:48 -08:00
Max Brunsfeld
b893ac2a02
Merge branch 'main' into project-panel2
2023-11-14 09:33:48 -08:00
Nathan Sobo
e08f1690b3
Remove commented field
2023-11-14 09:33:28 -07:00
Antonio Scandurra
40c634e056
Merge remote-tracking branch 'origin/main' into editor2-blocks
2023-11-14 17:16:58 +01:00
Antonio Scandurra
7f5014b34a
Add red background to blocks that need styling
2023-11-14 17:15:33 +01:00
Antonio Scandurra
0b8ec5372b
Return the line length when x is past the last glyph
...
Co-Authored-By: Julia <julia@zed.dev>
2023-11-14 17:06:18 +01:00
Antonio Scandurra
d855e91e43
Honor cmd-w to close active item
...
Co-Authored-By: Julia <julia@zed.dev>
2023-11-14 16:38:20 +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 Scandurra
b6914bf0fd
Re-enable find all references
...
Co-Authored-By: Julia <julia@zed.dev>
2023-11-14 16:09:29 +01:00
Antonio Scandurra
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
Joseph T. Lyons
516a8790b9
Add gpt-4-1106-preview model
2023-11-14 08:28:57 -05: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
be18c47912
Remove unnecessary with_element_id calls
2023-11-14 01:38:13 -07:00
Nathan Sobo
a5306c2312
Remove div module
2023-11-14 01:25:10 -07:00
Nathan Sobo
80014a28ea
No compile errors or warnings
2023-11-14 01:23:09 -07:00
Nathan Sobo
27fb381cca
Checkpoint
2023-11-14 01:15:48 -07:00
Mikayla
8aa076692e
Add missing global
2023-11-14 00:09:42 -08:00
Mikayla
ee4957dd47
Implement most core actions
2023-11-14 00:06:33 -08:00
Nathan Sobo
ce30a689a0
Checkpoint
2023-11-13 23:15:45 -07:00
Mikayla
ec16e70336
Sketch in core zed actions code
2023-11-13 22:13:07 -08:00
Nathan Sobo
9382a304c4
Checkpoint
2023-11-13 23:03:14 -07:00
Nathan Sobo
1668330764
Checkpoint
2023-11-13 22:51:44 -07:00
Nathan Sobo
4a3a1ad0c3
Checkpoint
2023-11-13 22:42:19 -07:00
Nathan Sobo
54a817a5ab
Checkpoint
2023-11-13 22:28:33 -07:00
Nathan Sobo
f71afdb0f2
Checkpoint
2023-11-13 22:22:09 -07:00
Nathan Sobo
83a5f74493
Checkpoint
2023-11-13 22:02:05 -07:00
Conrad Irwin
ad017a5df5
Allow clicking on commands in the command palette
2023-11-13 21:42:27 -07:00
Conrad Irwin
4ef95f05e8
Fix elevation on go_to_line2
2023-11-13 21:42:04 -07:00
Conrad Irwin
e0416e9d2a
Fix SingleLine editor font size
2023-11-13 21:41:41 -07:00
Nathan Sobo
044d9679ab
Checkpoint
2023-11-13 21:40:02 -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
872b5186e2
Checkpoint
2023-11-13 19:23:07 -07:00
Nathan Sobo
922bb3195b
WIP
2023-11-13 18:58:42 -07:00
