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
2d1d75f482
+ManagedView
...
And some games with rust traits
2023-11-16 23:02:10 -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
Mikayla Maki
61bd6bab09
Actions‽ ( #3349 )
...
This PR re-implements our actions with macros instead of a blanket impl.
Release Notes:
- N/A
2023-11-16 18:18:04 -08: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
Nate Butler
3223e21d9f
Add dock borders
2023-11-16 16:17:17 -05:00
Nate Butler
a526f23c81
Add ui_font settings and set default rem size accordingly ( #3346 )
...
[[PR Description]]
- Adds ui_font_family, ui_font_features, ui_font_size to settings and
default settings
- Use the new ui font settings to set the rem size when the workspace is
created.
Release Notes:
- N/A
2023-11-16 15:40:33 -05:00
Conrad Irwin
267e07472d
Checkpoint, MenuHandle can open one
2023-11-16 13:32:19 -07:00
Nate Butler
fa9f4a9355
Init rem_size in the workspace at the start of the render
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-11-16 13:43:36 -05: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
Conrad Irwin
4540f04dbe
Add more detail to panel switcher interaction
2023-11-16 09:57:59 -07:00
Piotr Osiewicz
6b6a30c3da
Merge branch 'main' into search2
2023-11-16 17:16:15 +01:00
Kirill Bulatov
fd61683c46
WIP
2023-11-16 10:40:02 +02:00
Kirill Bulatov
a238368296
More compilation fixes
2023-11-16 10:04:18 +02:00
Mikayla
9da0b78ead
Merge branch 'main' into tabs-n-splits
2023-11-15 23:41:25 -08:00
Mikayla
c70c0f9ae9
Remove initialize_workspace
2023-11-15 23:11:31 -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
e905ababcd
Add back splitting
2023-11-15 15:21:19 -08:00
Conrad Irwin
793fa6e3a4
Move placeholder titlebar render to collab_ui
2023-11-15 16:09:21 -07:00
Mikayla
faf93aed4e
checkpoint
2023-11-15 14:17:04 -08:00
Conrad Irwin
cebc8428c8
FileFinder tests
2023-11-15 13:16:28 -07:00
Piotr Osiewicz
b11bfa8821
Merge branch 'main' into search2
2023-11-15 12:54:26 +01: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
Conrad Irwin
1109cd11c8
Abandon ship
2023-11-14 16:17:24 -07:00
Mikayla
6b25841e2a
WIP
2023-11-14 14:48:34 -08:00
Nate Butler
008655b879
Set Pane Size
2023-11-14 16:47:52 -05:00
Conrad Irwin
3b01a032ba
In the middle of stuff
2023-11-14 14:38:23 -07:00
Conrad Irwin
80b7f75d24
Merge branch 'main' into file_finder
2023-11-14 13:34:25 -07:00
Conrad Irwin
3a4c5aa440
Implement FileFinder
2023-11-14 13:34:14 -07:00
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
90d7033fd0
Pass KeyBindings to TextTooltips
2023-11-14 13:36:03 -05: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
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
b893ac2a02
Merge branch 'main' into project-panel2
2023-11-14 09:33:48 -08:00
Piotr Osiewicz
c14efb74d7
Finish up touchups for search UI.
...
Co-authored-by: Nate <nate@zed.dev>
2023-11-14 18:18:52 +01:00
Piotr Osiewicz
08dde94299
WIP styling
...
Co-authored-by: Nate <nate@zed.dev>
2023-11-14 17:59:53 +01:00
Conrad Irwin
7d94d8940c
Not working yet file-finder2
2023-11-14 09:28:18 -07:00
Antonio Scandurra
40c634e056
Merge remote-tracking branch 'origin/main' into editor2-blocks
2023-11-14 17:16:58 +01:00
Piotr Osiewicz
6c69e40e5c
WIP
2023-11-14 16:56:31 +01:00
