oak-team/oak-gpui
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
13,920 Commits 1 Branch 0 Tags
efa27cf9b8743307724b2c1924db298531bf6944
Commit Graph
13920 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra efa27cf9b8 Uncomment more editor code 2023-11-03 10:09:00 +01:00
Antonio Scandurra cdc82d01f7 Call editor::init 2023-11-03 09:06:25 +01:00
Antonio Scandurra 800c2685ea Remove dependency from gpui from editor2 2023-11-03 09:05:58 +01:00
Nathan Sobo fbee6b5352 Get editor2 compiling with a ton of code commented out 2023-11-02 23:35:20 -06:00
Nathan Sobo f3b8a9d8c2 WIP 2023-11-02 22:56:04 -06:00
Nathan Sobo a731f8fb1e WIP 2023-11-02 21:28:56 -06:00
Nathan Sobo dfc7c81500 WIP 2023-11-02 21:03:29 -06:00
Nathan Sobo 72b9dc8216 Merge remote-tracking branch 'origin/main' into editor2 2023-11-02 20:47:09 -06:00
Nathan Sobo 6a89f7ce4f rich text2 (#3220) 
- git -> git3
- Add rich_text2

[[PR Description]]

Release Notes:

N/A
 2023-11-02 20:46:45 -06:00
Nathan Sobo 2a12e8f307 Merge remote-tracking branch 'origin/rich_text2' into editor2 2023-11-02 20:34:52 -06:00
Conrad Irwin 0b3932f38c Convert rich_text2 2023-11-02 19:30:33 -06:00
Conrad Irwin 6ecb4805f7 Add rich_text2 2023-11-02 19:19:18 -06:00
Conrad Irwin cbd902658c git -> git3 
This is needed for the editor.
 2023-11-02 19:18:01 -06:00
Conrad Irwin 0aabb19a45 Into the woods 2023-11-02 18:52:08 -06:00
Nathan Sobo 9052b48949 Use correct color values in quad fragment shader (#3217) 
Previously, when using rounded corners, the borders would get wider.
Looks like we weren't using the input color values consistently in the
fragment shader. The quad values are raw HSLA and are converted in the
vertex shader.

Release Notes:

- N/A
 2023-11-02 17:49:56 -06:00
Nathan Sobo 7b712ac68f WIP 2023-11-02 16:47:14 -06:00
Conrad Irwin 583c36e24b WIP 2023-11-02 15:27:49 -06:00
Conrad Irwin 09efa017d4 Editor2 2023-11-02 14:36:42 -06:00
Conrad IrwinandNathan 9e5275cc18 Fix error handling of open_path 
Co-Authored-By: Nathan <nathan@zed.dev>
 2023-11-02 14:34:43 -06:00
Marshall Bowers 54969877a4 Make the Zed2 window movable (#3218) 
This PR makes the Zed2 window movable and fixes a crash related to a
`todo!()` that wasn't necessary.

Release Notes:

- N/A
 2023-11-02 16:17:31 -04:00
Conrad Irwin 6eeaa64e62 workspace2 (#3188) 
Tracking PR for workspace port
 2023-11-02 13:34:19 -06:00
Conrad Irwin 8283909dfd Disable selective warnings to make cargo check happy 2023-11-02 13:28:58 -06:00
Nathan SoboandJulia Risley 91f3e9707a Use correct color values in quad fragment shader 
Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-11-02 13:18:20 -06:00
Conrad Irwin 269a72464d Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 13:16:24 -06:00
Mikayla Maki 85f0959548 Remove the 2s from source code (#3216) 
Release Notes:

- N/A
 2023-11-02 12:11:16 -07:00
Marshall Bowers 9c8220d04e Remove commented-out label code 2023-11-02 15:04:52 -04:00
Marshall Bowers 3605afc163 Render active item in pane 2023-11-02 14:40:34 -04:00
Nathan Sobo d1cb2d3e11 Enforce Send bound on next frame callback functions, because they're invoked on arbitrary threads (#3215) 
This enforces the send bound, then uses an async task looping on a
channel to run callbacks on the main thread.
 2023-11-02 12:36:38 -06:00
Marshall Bowers 8b1b7a2f80 Checkpoint: Basic tab bar structure 2023-11-02 14:34:48 -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
Nathan SoboandJulia Risley 04a8ee222b Enforce a Send bound on next frame callbacks 
This required using mpsc channels to invoke frame callbacks on the
main thread and send the receiver to the platform display link.

Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-11-02 12:01:22 -06:00
Mikayla d11ff14b57 Remove the 2s from source code 2023-11-02 10:55:02 -07:00
Conrad Irwin 5a41eed120 WIP 2023-11-02 11:34:31 -06:00
Marshall Bowers 1e7a216d55 WIP 2023-11-02 13:21:28 -04:00
Conrad IrwinandAntonio 8f0f5a9ba1 Render status bar 
Co-Authored-By: Antonio <me@as-cii.com>
 2023-11-02 11:18:11 -06:00
Conrad IrwinandAntonio 803d2b6710 Add double click to zoom the window 
Co-Authored-By: Antonio <me@as-cii.com>
 2023-11-02 10:58:46 -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
Conrad IrwinandMikayla bd54bfa4e1 Render titlebar 
Co-Authored-By: Mikayla <mikayla@zed.dev>
 2023-11-02 10:31:18 -06:00
Conrad IrwinandAntonio 634aba89d2 Add back some window events for workspace 
Co-Authored-By: Antonio <me@as-cii.com>
 2023-11-02 10:03:03 -06:00
Nate Butler a3565225ad Document format_distance (#3214) 
Adds docs for `ui2::util::format_distance`:
- distance_in_seconds
- distance_string
- naive_format_distance
- naive_format_distance_from_now

These are ports of
[`date-fns`](https://date-fns.org/v2.30.0/docs/formatDistance)'s format
distance utilities

[[PR Description]]

Release Notes:

- N/A
 2023-11-02 11:58:45 -04:00
Julia 17ff881e7a Uncomment lsp2 tests (#3213) 
Release Notes:

- N/A
 2023-11-02 11:54:06 -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
Conrad Irwin 0bab1a92df Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 09:44:38 -06:00
Antonio Scandurra fd81d838fe Introduce ViewContext::observe_window_{activation,bounds} (#3212) 
Release Notes:

- N/A
 2023-11-02 16:44:26 +01:00
Julia b7efab8a55 Uncomment lsp2 tests 2023-11-02 11:42:48 -04:00
Marshall Bowers ec0cff0e1a Add map method to Components (#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
Antonio ScandurraandConrad Irwin ec4f0d7bca Implement ViewContext::observe_window_activation 
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
 2023-11-02 16:37:57 +01:00
Antonio ScandurraandConrad Irwin 3a824e468f Subsume observe_fullscreen into observe_window_bounds 
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
 2023-11-02 16:31:27 +01:00