oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,850 Commits 1 Branch 0 Tags
9590f253a924334cd451db30516ff72a9ea209ff
Commit Graph
418 Commits
Author SHA1 Message Date
Piotr Osiewicz 5cbe8deb50 Fix up tests 2023-11-27 12:33:44 +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 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
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 BowersandNate Butler 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 ButlerandMarshall Bowers 40a49e6896 Update popover doc 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-21 12:43:56 -05:00
Nate ButlerandMarshall Bowers 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 ButlerandMarshall Bowers 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
MikaylaandPiotrek 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
MikaylaconradNathan
 		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
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