oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,485 Commits 1 Branch 0 Tags
f4eb219c7539ba80dbee09e7096584ab2e7ed88d
Commit Graph
14485 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mikayla Maki 96f0257fb3 Simplify element types (#3318) 
This PR does away with the extra type parameters on Div and instead
introduces two wrapper elements, `Stateful` and `Focusable`. All of the
interactivity is stored on `Interactivity` and `InteractiveState`, which
is stored on the base element. The wrappers simply control what methods
are available to call.

Not sure this is fully working, but a smoke test does work.

/cc @as-cii @ConradIrwin 

Release Notes:

- N/A
 2023-11-14 16:03:20 -08:00
Mikayla 817c6dd49c remove dbg 2023-11-14 15:57:23 -08:00
Mikayla b81b96f353 Merge branch 'element-types' of github.com:zed-industries/zed into element-types 2023-11-14 15:55:53 -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
Nathan SoboandJulia bef4df5df9 Return an id from Element::element_id instead of calling cx.with_element_id 
Co-Authored-By: Julia <julia@zed.dev>
 2023-11-14 16:05:28 -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
Mikayla 6b25841e2a WIP 2023-11-14 14:48:34 -08:00
Max Brunsfeld 606ab74b9f Project panel: detect filename editor blur via an editor event 2023-11-14 14:02:28 -08:00
Nate Butler b40daa132f Set Pane Size (#3327) 
[[PR Description]]

Set the size of panes to their `size`.

Release Notes:

- N/A
 2023-11-14 16:57:09 -05: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
Marshall Bowers fea0ff3745 Use IconElement in project panel (#3326) 
This PR updates the project panel to use the `IconElement` to render
icons instead of duplicating the styles.

Release Notes:

- N/A
 2023-11-14 15:52:57 -05: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 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
Mikayla Maki dcdbf43af0 Fix some small quit and recursion bugs (#3323) 
Release Notes:

- N/A
 2023-11-14 12:32:41 -08:00
Mikayla 62fc0b2100 Remove unnescessary unimplemented 2023-11-14 12:12:02 -08:00
Julia 75490fe2b1 Avoid user NPM config/cache & put NodeRuntime installation behind a lock (#3324) 
Release Notes:

- Fixed a case where system NPM configuration could effect Node based
language server installation.
 2023-11-14 15:08:48 -05:00
Julia 59ec9e508b Avoid user NPM config/cache & put NodeRuntime installation behind a lock 2023-11-14 14:49:31 -05:00
Mikayla 3419aaf17e Fix several shutdown related bugs 2023-11-14 11:42:58 -08: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 dc56a7b12b Add LabelSize 2023-11-14 13:43:37 -05:00
Mikayla Maki 6add446334 WIP: Zed2: Add core mac app actions (#3316) 
Add back cmd-q, cmd-n, etc.

TODO:
- [x] Fix quit checking workspace windows
- [ ] ~~See if GPUI2 has a DebugElements analog~~

Release Notes:

- N/A
 2023-11-14 10:41:03 -08: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
Conrad Irwin f4ccff7b72 TEMP 2023-11-14 11:03:55 -07: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 5ae96e4eb6 Render blocks in editor2 (#3320) 
Release Notes:

- N/A
 2023-11-14 17:29:55 +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
Antonio Scandurra 7f5014b34a Add red background to blocks that need styling 2023-11-14 17:15:33 +01:00
Antonio ScandurraandJulia 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 ScandurraandJulia d855e91e43 Honor cmd-w to close active item 
Co-Authored-By: Julia <julia@zed.dev>
 2023-11-14 16:38:20 +01:00