oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,040 Commits 1 Branch 0 Tags
27a6761afc8d4e641fb5eaf932aefc8b48db1b0a
Commit Graph
47 Commits
Author SHA1 Message Date
Max Brunsfeld dbfc7d3555 Merge branch 'main' into project-panel-context-menu 2023-11-29 09:45:31 -08:00
Max BrunsfeldandConrad 233aac5573 Make DismissEvent a unit struct 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-29 09:42:54 -08:00
Max BrunsfeldandConrad ac34229118 Add keyboard control over context menus 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-29 09:39:20 -08:00
Max Brunsfeld 6bf7ad71eb Show action key bindings in context menus 2023-11-28 16:07:42 -08:00
Mikayla a41c857855 Merge branch 'main' into welcome2 2023-11-28 15:38:51 -08:00
Mikayla ed8e62cd18 Restore welcome page and several pickers 2023-11-28 15:25:28 -08:00
Max Brunsfeld bcf449d3fe Add a basic context menu to the project panel 2023-11-28 15:12:46 -08:00
Marshall Bowers 9411898720 Use ListItems in the project panel (#3421) 
This PR reworks the project panel to render its items using the
`ListItem` component.

There are a few hacks in here in order to get click handlers working for
the `ListItem`, but we'll want to get these fixed in GPUI.

Release Notes:

- N/A
 2023-11-28 13:11:43 -05:00
Conrad Irwin 107c3d7f67 Fix esc in command palette 
Also: add editor.register_action
 2023-11-27 14:32:22 -07: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 2c8d243d22 Comment out todo!() to fix panic when opening context menus 2023-11-22 12:41:06 -05: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
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
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
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
JuliaandNathan Sobo 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
Kirill Bulatov 12b59daa1e Allow to exclude files from worktrees (#3356) 
* Part of https://github.com/zed-industries/community/issues/70

Allows to fully remove from Zed certain files or file groups: no items
will be scanned or added into worktrees, so nothing will be shown in
project tree, project search and go to file would not see those,
corresponding FS events will be ignored.

One exclusion is .git files: those are still not shown or accessible by
default, yet tracked in the worktrees.

By default, is configured to 
```json
  "file_scan_exclusions": [
    "**/.git",
    "**/.svn",
    "**/.hg",
    "**/CVS",
    "**/.DS_Store",
    "**/Thumbs.db",
    "**/.classpath",
    "**/.settings"
  ],
```

* In addition, contains code preparations for "search in included files"
feature: new SearchOptions variant, search crate and RPC adjustments

Release Notes:

- Added `file_scan_exclusions` section to project settings to completely
ignore certain files in Zed
 2023-11-17 23:06:47 +02:00
Kirill Bulatov d352a63d9d Port new workspace logic to gpui2, uncomment most of the workspace2 tests 2023-11-17 22:54:19 +02:00
Conrad Irwin 624bd0a05a Collab ui2 (#3357) 
* Clickable context menus & movable panels – what will they think of
next?!

Release Notes:

- N/A
 2023-11-17 13:33:18 -07:00
Conrad Irwin ceb20dea96 Refactorings 2023-11-17 13:23:12 -07:00
Mikayla 9a3cd073c7 Restore a bunch of random workspace stuff 2023-11-16 23:05:28 -08: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
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 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
Max Brunsfeld ca63a99736 Enable tests in project panel 2 (#3325) 2023-11-14 15:02:51 -08:00
Max Brunsfeld 860959fe13 Implement simulated prompts in TestPlatform 2023-11-14 14:56:50 -08:00
Max Brunsfeld 606ab74b9f Project panel: detect filename editor blur via an editor event 2023-11-14 14:02:28 -08:00
Max Brunsfeld 123faed5b0 Re-enable all project panel tests 
Some are still failing.
 2023-11-14 12:45:46 -08:00
Marshall Bowers 22f024bd5f Use IconElement in project panel 2023-11-14 15:44:26 -05:00
Conrad Irwin 5dda105182 Merge branch 'main' into element-types 2023-11-14 11:45:19 -07:00
Max Brunsfeld 2c3c238c9d Fix warnings 2023-11-14 09:47:48 -08:00
Mikaylaandconrad a4e9fea133 WIP 
co-authored-by: conrad <conrad.irwin@zed.dev>
 2023-11-13 15:53:04 -08:00
Max Brunsfeld 2eedd2ad03 Merge branch 'main' into project-panel2 2023-11-13 13:39:13 -08:00
Max BrunsfeldJuliaMarshall
 		c0f34e3302 Add delete, open file, and rename actions to the project panel 
Co-authored-by: Julia <julia@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
 2023-11-13 11:38:47 -08:00
Max BrunsfeldMarshallJulia
 		91b634fc59 Get some project panel actions working 
Add styling for hovered and selected items

Co-authored-by: Marshall <marshall@zed.dev>
Co-authored-by: Julia <julia@zed.dev>
 2023-11-13 11:08:51 -08:00
Max BrunsfeldJuliaMarshall
 		13dd912817 Get left, right, and bottom docks rendering in the right places in the workspace 
Co-authored-by: Julia <julia@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
 2023-11-13 10:47:15 -08:00
Mikayla 13255ef133 Poke at getting the project panel showing up 2023-11-12 23:22:02 -08:00
Max Brunsfeld b9e098ead8 Start work on creating gpui2 version of project panel 2023-11-09 16:51:03 -08:00