Piotr Osiewicz
6c37393dd1
Add contact finder, change ui::List's on_click handler signature
2023-11-28 14:16:51 +01:00
Nate Butler
979ff70196
Update popover.rs
2023-11-27 20:12:20 -05:00
Nate Butler
ca2052b0c1
Merge branch 'main' into completions-styles
2023-11-27 19:22:07 -05:00
Conrad Irwin
4a25fae51e
TEMP
2023-11-27 16:22:01 -07:00
Julia
d551b41aae
zed2: Mostly port breadcrumbs & improve StyledText
api
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-11-27 16:09:31 -05:00
Marshall Bowers
24f3034106
Add ListItem
story ( #3411 )
...
This PR adds a story for the `ListItem` component, so we can work on it
in isolation.
Release Notes:
- N/A
2023-11-27 15:24:41 -05:00
Conrad Irwin
4f885252ab
[Zed2] Collab UI ( #3403 )
...
Release Notes:
- N/A
2023-11-27 12:40:59 -07:00
Marshall Bowers
19ecccb107
Add ListItem
story
2023-11-27 14:20:33 -05:00
Conrad Irwin
82f6f77117
Use editor's overlay implementation
2023-11-27 11:49:51 -07:00
Conrad Irwin
212d9254e1
Merge branch 'main' into completions-styles
2023-11-27 11:49:39 -07:00
Nate Butler
ab83f4319b
revert popover changes
...
[no ci]
2023-11-27 11:51:42 -05:00
Conrad Irwin
fd165206bf
gpui2: Notifications ( #3407 )
...
Release Notes:
- N/A
2023-11-27 09:22:31 -07:00
Nate Butler
8a35a02863
Checkpoint - try using overlay for completions popover
...
[no ci]
2023-11-27 11:22:19 -05:00
Nate Butler
1acc6b462f
Start on completions styles
2023-11-27 10:29:29 -05:00
Piotr Osiewicz
5cbe8deb50
Fix up tests
2023-11-27 12:33:44 +01:00
Conrad Irwin
039c933d8e
gpui2: Notifications
2023-11-26 22:28:53 -07:00
Nate Butler
6a3925c3e1
Add copilot icons
2023-11-24 09:22:31 -05:00
Nate Butler
7e61d340ce
Outline some unfinished elements
2023-11-24 08:58:49 -05:00
Antonio Scandurra
56d043f671
Allow finding which ranges were clicked on an InteractiveText
2023-11-23 18:08:49 +01:00
Piotr Osiewicz
390ecb5b0c
Merge branch 'main' into collab_ui-zed2
2023-11-23 15:02:55 +01:00
Piotr Osiewicz
c191943849
Add basic call/user UI in top-right corner.
...
Allow ui::Avatar to take custom data instead of always relying on URI resolution
2023-11-23 15:00:13 +01: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 ListItem
s
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
Marshall Bowers
a94cf54aab
Fix storybook ( #3379 )
...
This PR fixes storybook and gets it back into a compiling and running
state.
Release Notes:
- N/A
2023-11-21 14:28:00 -05:00
Nate Butler
6fe7b22164
UI refinements + Popover ( #3377 )
...
[[PR Description]]
- Update default ui_font_size
- Update toolbar style
- Start on ui::Popover
Release Notes:
- N/A
2023-11-21 13:49:10 -05:00
Marshall Bowers
1b05aad30c
Extract Story
into separate story
crate ( #3378 )
...
This PR extracts the `Story` component into a separate `story` crate so
that it can be shared among various crates that define stories.
Release Notes:
- N/A
---------
Co-authored-by: Nate Butler <iamnbutler@gmail.com>
2023-11-21 13:42:00 -05:00
Nate Butler
40a49e6896
Update popover doc
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-21 12:43:56 -05:00
Nate Butler
9a145a4d86
Correctly position popover aside, add list item states
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-21 12:40:48 -05:00
Nate Butler
9f2e3bab9b
Allow popover to take an aside
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-21 12:26:10 -05:00
Nate Butler
dac7912e87
Start on popover
2023-11-21 12:10:06 -05:00
Marshall Bowers
f4b4bdfd83
ui2: Get component stories compiling again ( #3376 )
...
This PR gets the component stories defined in `ui2` compiling again.
Release Notes:
- N/A
2023-11-21 12:06:25 -05:00
Nate Butler
f04deeb5f9
Document InteractionState
2023-11-21 11:51:15 -05:00
Nate Butler
209fb10731
Remove stories mod until it is re-enabled
2023-11-21 01:36:35 -05:00
Nate Butler
8947438510
Update elevation
2023-11-21 01:23:47 -05:00
Nate Butler
453aa5ffd7
TextColor
-> Color
2023-11-21 01:05:29 -05:00
Nate Butler
56d45e72cd
Add Shape enum to avatar component, refactor UITextSize to styles/typography.rs
2023-11-21 00:59:29 -05:00
Nate Butler
205607a9cd
Clean out UI
2023-11-21 00:44:51 -05:00
Piotr Osiewicz
2138715fca
Merge remote-tracking branch 'origin/callback-handles' into search2
2023-11-21 01:16:21 +01:00
Mikayla
a844bf7d41
Fix stories
...
co-authored-by: Piotrek <piotr@zed.dev>
2023-11-20 16:06:10 -08:00
Piotr Osiewicz
54a3b56935
Merge remote-tracking branch 'origin/callback-handles' into search2
2023-11-21 00:40:20 +01:00
Conrad Irwin
8049ec674e
Fix last thing
2023-11-20 16:35:56 -07:00
Conrad Irwin
5c0f2e75ea
Remove all the settings
2023-11-20 16:30:14 -07: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
d0dd44faad
Merge branch 'main' into callback-handles
2023-11-20 12:21:42 -07:00
Piotr Osiewicz
d60855b06d
Merge branch 'main' into search2
2023-11-20 19:23:35 +01:00
Piotr Osiewicz
fa8cd843ca
fixup! Merge branch 'main' into search2
2023-11-20 18:42:15 +01:00
Piotr Osiewicz
07cc5904f8
Merge branch 'main' into search2
2023-11-20 18:37:41 +01: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
Nate Butler
176a68f90f
kb
2023-11-20 10:46:23 -05:00
Mikayla
f3eb1d4abf
Add button port example
2023-11-19 19:11:51 -08:00
Piotr Osiewicz
b67193e322
ui2: Do not enable 'stories' feature by default. ( #3363 )
...
This cuts down LLVM IR size from 3 million lines to 700k in debug build.
This then leads to ~3s compile time in debug build (without incremental
on ui itself), as opposed to 10.5s on main.
Release Notes:
- N/A
2023-11-19 12:11:42 +01:00
Piotr Osiewicz
e83a297229
Move binding function back into keybinding module
2023-11-19 11:54:46 +01:00
Piotr Osiewicz
31336b0b7d
ui2: Do not enable 'stories' feature by default.
...
This cuts down LLVM IR size from 3 million lines to 700k in debug build.
This then leads to ~3s compile time in debug build (without incremental on ui itself), as opposed to 10.5s on main.
2023-11-19 11:44:33 +01: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
be33f000e2
WIP: Lots of errors, starting on resurrecting derive Element
2023-11-18 00:27:40 -07:00
Nathan Sobo
23ffce9fbe
WIP: Work toward eliminating Component trait
...
This refactor enhances the overall design by promoting reusable and composable UI component structures within the Zed project codebase.
2023-11-18 00:03:23 -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
Nate Butler
b218ab4755
Remove default hover state for icon buttons
2023-11-18 01:02:21 -05:00
Julia
189ddf9380
Merge branch 'main' into unborked-git-zed2-diagnostics-view
2023-11-17 16:43:29 -05:00
Julia
3655a96e54
Merge branch 'main' into unborked-git-zed2-diagnostics-view
2023-11-17 16:32:35 -05:00
Julia
967ef9d414
Render diagnostics view and such a bit more
2023-11-17 16:32:35 -05:00
Julia
f4eb219c75
Get diagnostics view almost building in the zed2 world
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-11-17 16:32:35 -05: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
Piotr Osiewicz
dca2dc7b6b
Merge branch 'main' into search2
2023-11-17 13:22:30 +01: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
Conrad Irwin
547888942f
Add storybook3
2023-11-16 19:42:25 -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
9c5f580012
Use Selected
for active IconButtons
2023-11-16 16:17:10 -05:00
Nate Butler
3d8e63b93b
Buttons should always use cursor_pointer
2023-11-16 16:09:11 -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
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
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
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 KeyBinding
s to TextTooltip
s
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 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
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
Conrad Irwin
f464d69ff8
Merge branch 'main' into dispatch-tree
2023-11-13 13:21:57 -07:00
Piotr Osiewicz
dfd68d4cb8
WIP: start search2
2023-11-13 20:38:37 +01:00
Marshall Bowers
3654dd8da0
Remove unnecessary map
2023-11-13 11:10:08 -05:00
Marshall Bowers
5b254b03df
Move Sized
bound to StyledExt
trait
2023-11-13 11:10:00 -05:00
Nathan Sobo
7eaba8fabc
WIP
2023-11-10 14:47:45 -07:00
Nate Butler
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 Butler
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 Scandurra
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 Butler
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 Butler
9bdfc7a2e5
Update StyledExt to impl over I & F as well as V for Div
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-08 15:25:44 -05:00
Nate Butler
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
Nate Butler
4ef2f0b2b9
Update StyledExt to use more idiomatic method naming
2023-11-08 14:42:56 -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
Marshall Bowers
761d4fcd49
Port the picker and uniform list ( #3248 )
...
This adds a `UniformList` element and partially implements `Picker` as a
component, using `UniformList`. Because editor2 isn't fully implemented
yet, the picker doesn't have filtering logic yet. We want to merge this
for now though, to make the UniformList element available for other
crates.
Release Notes:
- N/A
2023-11-08 17:45:23 +01:00
Marshall Bowers
b6766ba39a
Replace GitStatusColors
with StatusColors
( #3268 )
...
This PR removes `GitStatusColors` in favor of just using `StatusColors`
instead.
Release Notes:
- N/A
2023-11-08 11:32:32 -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
Antonio Scandurra
bdf6e8bcc7
Merge remote-tracking branch 'origin/main' into editor2-paint
2023-11-07 13:09:48 +01:00
Mikayla
85000eba81
wip: picker
...
co-authored-by: nathan <nathan@zed.dev>
co-authored-by: max <max@zed.dev>
2023-11-06 17:09:38 -08:00
Nate Butler
99a57d922f
Add theme importer ( #3246 )
...
[[PR Description]]
Thanks @maxdeviant for all the help with this one 🫂
- Adds the `theme_importer` crate
- Adds the ability to import themes in VSCode Format.
- Adds the `assets/themes/src` folder with source files for imported
themes
- Adds an initial set of themes: `andromeda`, `ayu`, `dracula`,
`gruvbox`, `night-owl`, `noctis`, `palenight`, `rose-pine`, `solarized`,
`synthwave-84`.
From the README:
## Usage
- `cargo run -p theme_importer` - Import the context of
`assets/themes/src`
---
## Troubleshooting
As the importer generates rust files, you may need to manually do some
cleanup in `registry.rs` and `themes/mod.rs` if you remove themes or
delete the `themes` folder in the theme crate.
---
## Required Structure
To import a theme or series of themes 3 things are required:
- `family.json`: A JSON file containing the theme family metadata and
list of theme variants
- `{theme_name}.json`: One theme json for each theme variant
- `LICENSE`: A license file for the theme family
### `family.json`
#### `name`
The name of the theme family. Avoid special characters.
This will be used for the theme family directory name (lowercased) and
the theme family name in the Zed UI.
Good:
- `Rose Pine`
- `Synthwave 84`
- `Monokai Solarized`
Bad:
- `Rosé Pine`
- `Synthwave '84`
- `Monokai (Solarized)`
#### `author`
The author of the theme family. This can be a name or a username.
This will be used for the theme family author in the Zed UI.
#### `themes`
A list of theme variants.
`appearance` can be either `light` or `dark`. This will impact which
default fallback colors are used, and where the theme shows up in the
Zed UI.
### `{theme_name}.json`
Each theme added to the family must have a corresponding JSON file. This
JSON file can be obtained from the VSCode extensions folder (once you
have installed it.) This is usually located at `~/.vscode/extensions`
(on macOS).
You can use `open ~/.vscode/extensions` to open the folder in Finder
directly.
Copy that json file into the theme family directory and tidy up the
filenames as needed.
### `LICENSE`
A LICENSE file is required to import a theme family. Failing to provide
a complete text license will cause it to be skipped when the import is
run.
If the theme only provices a license code (e.g. MIT, Apache 2.0, etc.)
then put that code into the LICENSE file.
If no license is provided, either contact the theme creator or don't add
the theme.
---
### Complete Example:
An example family with multiple variants:
```json
{
"name": "Ayu",
// When both name and username are available
// prefer the `username (name)` format
"author": "dempfi (Ike Ku)",
"themes": [
{
"name": "Ayu Light",
"file_name": "ayu-light.json",
"appearance": "light"
},
{
"name": "Ayu Mirage",
"file_name": "ayu-mirage.json",
"appearance": "dark"
},
{
"name": "Ayu Dark",
"file_name": "ayu-dark.json",
"appearance": "dark"
}
]
}
```
An example single variant family:
```json
{
"name": "Andromeda",
"author": "Eliver Lara (EliverLara)",
"themes": [
{
"name": "Andromeda",
"file_name": "andromeda.json",
"appearance": "dark"
},
{
"name": "Andromeda Bordered",
"file_name": "andromeda-bordered.json",
"appearance": "dark"
}
]
}
```
Release Notes:
- N/A
2023-11-06 16:08:05 -05:00
Conrad Irwin
496518f3e8
Use gpui instead of gpui2 consistenytly
2023-11-06 11:50:33 -07:00
Conrad Irwin
eb325fb387
editor2 rendering ( #3244 )
...
- Make tab bar visible
- Fix tab text colors
- Ensure panes cover the available space
- Make the close button close
- Fix bug when unsubscribe called after remove
- WIP: start on editor element
- Add hover behaviour to tabs
- Add PointingHand on tabs
- gpui2: Add on_hover events
- Tooltip on tabs
- MOAR TOOLTIPS
- Use an `IconButton` for the tab close button
- Remove unneeded type qualification
- Tooltips in mouse event handler & fix executor timer
- Move more tooltip logic into gpui2 & fix tooltip moving on paint
- Update tooltip code a bit
- Allow multiple subscriptions from one entity handle
Release Notes:
- N/A
2023-11-06 11:29:42 -07:00
Marshall Bowers
d224f511fa
Add interactivity to Checkbox
component ( #3240 )
...
This PR adds interactivity to the `Checkbox` component.
They can now be checked and unchecked by clicking them.
Release Notes:
- N/A
2023-11-06 13:22:25 -05:00
Conrad Irwin
c59817cd72
Merge branch 'main' into editor2-rendering
2023-11-06 11:06:43 -07:00
Conrad Irwin
3afdeeac1e
tooltip2 ( #3237 )
...
- Fix executor.timer() in gpui2
- Add support for tooltips
[[PR Description]]
Release Notes:
- N/A
2023-11-06 10:51:01 -07:00
Marshall Bowers
f8504c349c
Merge branch 'main' into import-theme
2023-11-06 12:08:46 -05: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
1bce5dcc69
Add checkboxes and their stories
2023-11-05 01:06:41 -05:00
Nate Butler
b125cc279f
Simplify toggle, do some reorganization
2023-11-04 11:24:31 -04:00
Conrad Irwin
de5458cfe0
Update tooltip code a bit
...
This fixes a tiny UX bug where the tooltip would appear to move if you
hovered over an element, then moved your mouse out and back within
500ms.
The fix is to retain the task, so we can drop it to cancel it when the
mouse leaves.
Also changes the time we construct the tooltip to the time it first
shows.
2023-11-03 21:40:28 -06:00
Julia
4725cd2cd6
Move more tooltip logic into gpui2 & fix tooltip moving on paint
...
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-03 18:37:15 -04:00
Nate Butler
b0d202ba5e
Merge branch 'main' into add-ui-docs
2023-11-03 18:20:17 -04:00
Nate Butler
9ce7199d2d
Add some initial docs
2023-11-03 18:19:54 -04:00
Julia
3834e26f71
Tooltips in mouse event handler & fix executor timer
...
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-03 18:02:58 -04:00
Marshall Bowers
76db100d11
ui2: Reorganize components ( #3228 )
...
This PR reorganizes the components in the `ui2` crate.
The distinction between "elements" and "components" is now gone, with
all of the reusable components living under `components/`.
The components that we built while prototyping but will eventually live
in other crates currently reside in the `to_extract/` module.
Release Notes:
- N/A
2023-11-03 17:34:11 -04:00
Nate Butler
d500b01aed
Add docs burndown list
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-03 16:37:22 -04:00
Marshall Bowers
1361b61708
Use an IconButton
for the tab close button
2023-11-03 16:36:02 -04:00
Nate Butler
740e2cc5bf
Start on ui root doc
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-03 16:28:54 -04:00
Conrad Irwin
33245d119e
Tooltip on tabs
...
Co-Authored-By: Julia <julia@zed.dev>
2023-11-03 14:02:46 -06:00
Conrad Irwin
c604a2e34e
Add hover behaviour to tabs
...
Co-Authored-By: Marshall <marshall@zed.dev>
Co-Authored-By: Nathan <nathan@zed.dev>
2023-11-03 10:55:07 -06:00
Nate Butler
b4e2368943
Merge branch 'main' into import-theme
2023-11-02 20:16:09 -04:00
Nate Butler
2b0c959137
Add terminal colors to ThemeColors, add _background
to some color names.
2023-11-02 19:53:52 -04:00
Nathan Sobo
29d8390743
Fix formatting
2023-11-02 12:28:58 -06:00
Nathan Sobo
1dd20d4c0a
Merge remote-tracking branch 'origin/main' into gpui2-image-reborrow
2023-11-02 12:25:06 -06:00
Marshall Bowers
0e1d2fdf21
Checkpoint: Narrow down error
2023-11-02 12:47:06 -04:00
Marshall Bowers
66e4d75e6f
Checkpoint: Reproduction with Avatar
story
2023-11-02 12:34:40 -04:00
Nate Butler
6f41a77a25
Document format_distance
...
Adds docs for:
- distance_in_seconds
- distance_string
- naive_format_distance
- naive_format_distance_from_now
2023-11-02 11:53:20 -04:00
Marshall Bowers
ec0cff0e1a
Add map
method to Component
s ( #3210 )
...
This PR adds a `map` method to the `Component` trait.
`map` is a fully-generalized form of `when`, as `when` can be expressed
in terms of `map`:
```rs
div().map(|this| if condition { then(this) } else { this })
```
This allows us to take advantage of Rust's pattern matching when
building up conditions:
```rs
// Before
div()
.when(self.current_side == PanelSide::Left, |this| this.border_r())
.when(self.current_side == PanelSide::Right, |this| {
this.border_l()
})
.when(self.current_side == PanelSide::Bottom, |this| {
this.border_b().w_full().h(current_size)
})
// After
div()
.map(|this| match self.current_side {
PanelSide::Left => this.border_r(),
PanelSide::Right => this.border_l(),
PanelSide::Bottom => this.border_b().w_full().h(current_size),
})
```
Release Notes:
- N/A
2023-11-02 11:39:40 -04:00
Nate Butler
d4db7a14b3
Remove unused import
2023-11-02 11:04:04 -04:00
Nate Butler
3b91a76159
Merge branch 'main' into n/t2
2023-11-02 11:02:55 -04:00
Nate Butler
d48ec7d58e
Remove unused import
2023-11-02 11:02:46 -04:00
Nate Butler
6d562aaa6f
Use naive_format_distance_from_now in Notifications
2023-11-02 11:02:17 -04:00
Nate Butler
b76c117979
Update naive_format_distance and tests
2023-11-02 10:37:33 -04:00
Nate Butler
cde7b244bc
Checkpoint - impl format_distance
2023-11-02 10:11:25 -04:00
Nathan Sobo
db9ccd7f34
Merge remote-tracking branch 'origin/main' into gpui2-no-send
2023-11-01 21:10:31 -06:00
Nathan Sobo
53066df522
Get project2 tests green
2023-11-01 20:14:40 -06:00
Nate Butler
d0975aacac
Merge branch 'main' into n/t2
2023-11-01 16:52:43 -04:00
Nate Butler
229ba0744e
Add additional notifications and style tweaks
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-01 16:50:59 -04:00
Nate Butler
be3cc6458c
Implement Notifications
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-01 16:34:42 -04:00
Nate Butler
3f74f75dee
WIP
2023-11-01 16:19:49 -04:00
Marshall Bowers
b910bbf002
Add ui_font_size
setting ( #3199 )
...
This PR adds a new `ui_font_size` setting that can be used to control
the scale of the entire UI.
We use the value in this setting to set the base rem size of the window.
Release Notes:
- N/A
2023-11-01 13:11:12 -04:00
Nate Butler
8dafd5f1f3
Allow ListHeader to take a meta
2023-11-01 12:43:25 -04:00
Marshall Bowers
3189cd779e
Remove unused impl
2023-11-01 10:52:25 -04:00
Nate Butler
3bcc2fa17b
Update notifications panel
2023-11-01 02:10:23 -04:00
Nate Butler
bfb1f5ecf0
Continue refining theme, update tabs & tab bar
2023-11-01 01:41:33 -04:00
Nate Butler
0efd69c60f
Refine default colors
2023-11-01 00:51:57 -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
Marshall Bowers
ba789fc0c4
Remove old theme constructs
2023-10-30 14:47:44 -04:00
Antonio Scandurra
1a54ac0d69
Rename Handle to Model
2023-10-30 19:44:01 +01:00
Marshall Bowers
14d24a9ac6
Remove references to old_theme
2023-10-30 14:36:49 -04:00
Marshall Bowers
7b4e699d0e
Remove themed
wrapper
2023-10-30 14:28:25 -04:00
Nathan Sobo
a1c3826858
Add View::update which provides a ViewContext
2023-10-26 19:41:42 +02:00
Antonio Scandurra
637cff3ebd
WIP
2023-10-26 17:15:19 +02:00
Marshall Bowers
973ca8d4f0
ui2: Remove dependency on theme
crate
2023-10-26 16:50:04 +02:00
Marshall Bowers
692aeff263
ui2: Remove dependency on settings
crate
2023-10-26 16:50:04 +02:00
Marshall Bowers
61694bba6a
Remove unneeded constructors for stories
2023-10-26 16:46:49 +02:00
Max Brunsfeld
0eae962abf
Represent theme's syntax colors with string keys
...
Co-authored-by: Marshall Bowers <marshall@zed.dev>
2023-10-26 16:38:50 +02:00
Marshall Bowers
ed233d583f
ui2: Remove ElementExt
trait
2023-10-26 15:59:18 +02:00
Marshall Bowers
1887f3b594
Rename S
type to V
2023-10-26 15:54:43 +02:00
Marshall Bowers
8a70ef3e8f
Remove unused state_type
2023-10-26 15:45:08 +02:00
Marshall Bowers
eb19071d84
ui2: Clean up take
s
2023-10-26 15:44:39 +02:00
Marshall Bowers
7b4a895ab9
ui2: Clean up drain
s
2023-10-26 15:41:29 +02:00
Marshall Bowers
d62c51a4b8
Merge branch 'gpui2-element-renderer' into zed2
2023-10-26 15:23:02 +02:00
Marshall Bowers
88ef74ec8f
Checkpoint: Compiling after view type removal
2023-10-26 15:20:38 +02:00
Marshall Bowers
c9c9db903d
Fix Component derive macro
2023-10-26 14:20:25 +02:00
Kirill Bulatov
27d2accb51
Fix the formatting
2023-10-26 13:52:04 +02:00
Kirill Bulatov
0a04c5734b
Update mouse position during file drag and drop
2023-10-26 13:50:35 +02:00
Nathan Sobo
f4cff69729
WIP: Macro not working fully yet
2023-10-26 13:18:58 +02:00
Nathan Sobo
0285284ae1
Rename IntoAnyElement trait to Component
2023-10-26 12:46:52 +02:00
Nathan Sobo
8ecfea55cd
Replace derive Element with derive IntoAnyElement everywhere
2023-10-26 12:38:23 +02:00
Nathan Sobo
315744ec20
Add derive macro for IntoAnyElement
2023-10-26 12:20:46 +02:00
Nathan Sobo
927278e20d
Remove IntoAnyElement bound from Element trait
2023-10-26 11:49:36 +02:00
Nathan Sobo
45a8aea0f0
Make FnOnces that render elements IntoAnyElement
2023-10-26 11:21:42 +02:00
Nathan Sobo
db7d12f628
WIP
2023-10-26 10:59:27 +02:00
Marshall Bowers
4266ead958
WIP: Trait bounds
2023-10-26 10:46:02 +02:00
Marshall Bowers
e31a9401a8
Merge branch 'remove-view-state-associated-type' into gpui2-element-renderer
2023-10-26 10:10:17 +02:00
Marshall Bowers
65389a8fac
Merge branch 'zed2' into gpui2-element-renderer
2023-10-26 10:10:10 +02:00
Marshall Bowers
9fb9885931
Checkpoint: Compiling
2023-10-26 10:08:39 +02:00
Marshall Bowers
9c10152c89
Use Display
instead of custom to_string
2023-10-26 09:30:21 +02:00
Marshall Bowers
28ef30f7a2
Removed unused ui2::color
module
2023-10-26 09:26:22 +02:00
Marshall Bowers
06bff41818
WIP: ElementRenderer
2023-10-25 21:08:34 +02:00
Marshall Bowers
7ec9cc08c7
Fix z-index targeting for drag and drop
2023-10-25 20:49:40 +02:00
Marshall Bowers
e67048ee7b
Load themes from settings and rework Settings
trait
2023-10-25 20:37:55 +02:00
Marshall Bowers
a0fe859d87
Make theme converter spit out valid Rust structs
2023-10-25 18:20:16 +02:00
Marshall Bowers
437d147935
Rename player
to players
2023-10-25 16:39:06 +02:00
Marshall Bowers
0867175a4e
Remove reference to removed ThemeColor
2023-10-25 16:34:03 +02:00
Marshall Bowers
4fcbc91aca
Add note about fixing dead_code
and unused_variables
warnings in ui2
2023-10-25 16:33:33 +02:00
Marshall Bowers
e1032c5341
Remove ThemeColor
in favor of theme2::Theme
2023-10-25 16:32:44 +02:00
Marshall Bowers
bb3f59252e
Rename theme2
getter to theme
2023-10-25 16:04:49 +02:00
Marshall Bowers
258496700f
Rename theme
getter to old_theme
2023-10-25 16:02:47 +02:00
Marshall Bowers
8043d0d8a9
Reference theme2
colors in ThemeColor
2023-10-25 15:58:56 +02:00
Marshall Bowers
dd34bb273e
Load Theme
from theme2
into the storybook
2023-10-25 15:50:50 +02:00
Kirill Bulatov
a01b507ef4
Add OS file drop event handler
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-10-24 19:26:06 +02:00
Marshall Bowers
d6bd000aa8
Rename cx.global_default_mut
to cx.global_default
2023-10-24 17:58:14 +02:00
Marshall Bowers
09866ec3e9
WIP
2023-10-24 16:59:24 +02:00
Nate Butler
9f48cdac83
Lower the default state intensities
2023-10-24 08:41:39 -04:00
Nate Butler
bfb37bbe94
Merge branch 'n/elevation' into zed2
2023-10-24 08:34:54 -04:00
Marshall Bowers
8117e7933c
Add missing bounds to Themed
2023-10-24 14:30:26 +02:00