Commit Graph
210 Commits
Author SHA1 Message Date
Mikayla 3a4d70b212 WIP 2023-11-03 12:04:24 -07:00
Max BrunsfeldandMarshall eeaa7c7685 Add channel2 crate
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-03 10:41:41 -07:00
Antonio Scandurra 53077fe80b Add ViewContext::window_context 2023-11-03 14:41:37 +01:00
Antonio Scandurra 12809e819d Allow converting from a WeakView<V> to an AnyWeakView 2023-11-03 11:36:18 +01:00
Antonio Scandurra 34b322b1e1 Uncomment Editor::new 2023-11-03 10:38:28 +01:00
Antonio Scandurra 595ccad409 Remove dependency from gpui from editor2 2023-11-03 09:05:58 +01:00
Nathan Sobo b7dfb4eeb4 WIP 2023-11-02 22:56:04 -06:00
Nathan Sobo 60e79c763a WIP 2023-11-02 21:28:56 -06:00
Nathan Sobo 7c2b802283 WIP 2023-11-02 21:03:29 -06:00
Nathan Sobo 4f755afb22 Merge remote-tracking branch 'origin/main' into editor2 2023-11-02 20:47:09 -06:00
Nathan Sobo f4502c5da6 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 7ebf696940 WIP 2023-11-02 16:47:14 -06:00
Conrad IrwinandNathan 2e06b2586a Fix error handling of open_path
Co-Authored-By: Nathan <nathan@zed.dev>
2023-11-02 14:34:43 -06:00
Nathan SoboandJulia Risley b6e6f89bc8 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 fdeff77625 Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 13:16:24 -06:00
Nathan Sobo 2cb2794a7b Merge remote-tracking branch 'origin/main' into gpui2-image-reborrow 2023-11-02 12:25:06 -06:00
Nathan SoboandJulia Risley f6c20cdc20 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
Marshall Bowers deecb5eb73 WIP 2023-11-02 13:21:28 -04:00
Conrad IrwinandAntonio 13ab124444 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 fb4132cd65 Checkpoint: Narrow down error 2023-11-02 12:47:06 -04:00
Marshall Bowers 071112b838 Checkpoint: Reproduction with Avatar story 2023-11-02 12:34:40 -04:00
Conrad IrwinandAntonio 64ddd2696e Add back some window events for workspace
Co-Authored-By: Antonio <me@as-cii.com>
2023-11-02 10:03:03 -06:00
Conrad Irwin 6da8bb337f Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 09:44:38 -06:00
Antonio Scandurra 1fc83692d2 Introduce ViewContext::observe_window_{activation,bounds} (#3212)
Release Notes:

- N/A
2023-11-02 16:44:26 +01:00
Marshall Bowers 77bb709e42 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 ae9e7aa6b5 Implement ViewContext::observe_window_activation
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-02 16:37:57 +01:00
Antonio ScandurraandConrad Irwin 8b551beb77 Subsume observe_fullscreen into observe_window_bounds
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-02 16:31:27 +01:00
Antonio ScandurraandConrad Irwin 889de80768 Add ViewContext::observe_fullscreen
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-02 16:11:52 +01:00
Antonio Scandurra 29bd56f879 Implement WindowContext::remove_window 2023-11-02 13:37:55 +01:00
Antonio Scandurra 86222b78a9 💄 2023-11-02 10:57:29 +01:00
Antonio Scandurra 457a1d6aab Introduce more GPUI2 APIs needed for transitioning the workspace 2023-11-02 10:54:33 +01:00
Antonio Scandurra fb2f5f1fcc Add back Send and Sync to AssetSource 2023-11-02 09:58:53 +01:00
Antonio Scandurra a92e8751bb Remove stray todo 2023-11-02 09:56:45 +01:00
Antonio Scandurra 10dac9979c Remove more Send bounds and simplify view rendering 2023-11-02 09:44:16 +01:00
Nathan Sobo c5a361d12b Merge remote-tracking branch 'origin/main' into gpui2-no-send 2023-11-01 21:10:31 -06:00
Nathan Sobo c3ff8609e8 Get language2 tests passing by not blocking on a foreground task 2023-11-01 21:04:17 -06:00
Nathan Sobo d2d9430fc8 Get project2 tests green 2023-11-01 20:14:40 -06:00
Max Brunsfeld f738d16c4d WIP - flush_fs_events 2023-11-01 17:45:38 -07:00
Max BrunsfeldandNathan Sobo 1a627a1b96 Fix hangs in new dispatcher
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2023-11-01 17:11:42 -07:00
Conrad Irwin e3c633ac57 beautiful diff 2023-11-01 15:31:37 -06:00
Conrad Irwin 1583375d99 Uncomment project2 tests (#3200) 2023-11-01 20:27:53 +00:00
Conrad Irwin 21d0376cbb Use run_until_parked instead of blocked in tests 2023-11-01 14:27:25 -06:00
Nathan Sobo 15b6f40fa1 Checkpoint 2023-11-01 14:00:26 -06:00
Nathan Sobo 8b342b1332 Split out a foreground and background executor 2023-11-01 13:53:45 -06:00
Max Brunsfeld 1da07b7433 wip 2023-11-01 13:53:45 -06:00
455983d912 Start removing the Send impl for App
Co-authored-by: Antonio <antonio@zed.dev>
Co-authored-by: Nathan <nathan@zed.dev>
2023-11-01 13:53:45 -06:00
Marshall Bowers 3a6d95b185 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
Julia 6db30335b1 Port multi_buffer to gpui2 2023-10-31 18:34:36 -04:00
Max BrunsfeldandMarshall b199bcb28b Merge branch 'main' into zed2-project-test
Co-authored-by: Marshall <marshall@zed.dev>
2023-10-31 11:50:56 -07:00
Antonio Scandurra b2615c691d Call initialize on the rendered element on AnyView 2023-10-31 17:17:42 +01:00