Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6532 commits 1103 branches 1111 tags 398 MiB
Commit graph

576 commits

Author SHA1 Message Date
Keith Simmons
61f0daa5c5 Visual line mode handles soft wraps 2022-05-26 17:02:05 -07:00
Nathan Sobo
d69776585d Add mouse_state method to RenderContext 
We can use this to determine if a region is hovered or clicked.
 2022-05-26 13:22:23 -06:00
Nathan Sobo
3a59d2a331 Allow hovered and clicked mouse regions to be tracked in the presenter 2022-05-26 12:44:52 -06:00
Nathan Sobo
0866f0ed55 Introduce CursorRegion struct 
This will blend in with an upcoming MouseRegion struct that sits next to it in the scene.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-26 11:00:10 -06:00
Antonio Scandurra
82ddac8e7e Restore focus when closing context menu 2022-05-26 15:21:55 +02:00
Antonio Scandurra
580f1a4125 Style context menu 2022-05-26 10:40:53 +02:00
Antonio Scandurra
a8483ba458 WIP 2022-05-26 09:59:25 +02:00
Antonio Scandurra
3b2f1644fb Constrain context menu to the width of the widest item 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-26 09:59:25 +02:00
Nathan Sobo
5b7825d5de Add MutableAppContext::keystrokes_for_action 
This can be used to lookup keystrokes that will dispatch an action based on the currently focused view. There might be multiple, but we return the first found, meaning the most recently added bindings matching that action for the closest view to the focused view in the hierarchy.
 2022-05-26 09:59:25 +02:00
Nathan Sobo
b110fd5fb7 Render a context menu when right-clicking in project panel 
It doesn't currently do anything, but I managed to get it rendering in an absolutely positioned way.
 2022-05-26 09:59:25 +02:00
Antonio Scandurra
3ac6fc89c1 Pretty-print JSON of server snapshot 2022-05-26 09:34:39 +02:00
Max Brunsfeld
fbd589b589 Start work on handling multibuffers properly when closing unsaved buffers 2022-05-22 16:48:33 -07:00
Max Brunsfeld
b72d97ce78 Disable menu item key equivalents while there are pending keystrokes 2022-05-20 10:04:43 -07:00
Max Brunsfeld
21862faa58 Convert function keys to the correct macOS codes for menu items 2022-05-19 17:37:46 -07:00
Max Brunsfeld
ea85473f4f Enable and disable application menu items based on the active view 2022-05-19 16:50:40 -07:00
Max Brunsfeld
ef0b584532 Remove AppState from workspace actions 
This allows those actions to be bound to keystrokes in the keymap.
Also, remove the WorkspaceParams struct, simplify how Workspaces are
constructed.
 2022-05-19 14:37:26 -07:00
Max Brunsfeld
7445197f4d Derive application menu key equivalents from the keymap 2022-05-19 10:04:01 -07:00
Antonio Scandurra
225536accc Merge branch 'main' into request-to-join-project 2022-05-17 14:55:20 +02:00
Antonio Scandurra
e0c772db3e Hold a weak handle to Presenter when dispatching events 
This ensures that the only strong reference to the presenter is held
by `App`. This is important because we want to call `flush_effects`
when removing a window and implicit drops of the `Presenter` would
make that hard.

Before this commit, if a rendered view contained strong handles to
views and models, we would only drop them on the next `flush_effects`.
This was manifesting itself in `Project`s not being released when
closing their containing window.
 2022-05-17 13:04:38 +02:00
Nathan Sobo
d821e7a4c1 Cancel join requests when the requester closes the window 2022-05-16 20:29:36 -06:00
Antonio Scandurra
aa90c06012 Display a temporary window while remote project is loading 2022-05-16 17:45:50 +02:00
Nathan Sobo
a620665bed Only synthesize mouse moves on scene construction if window is active 2022-05-13 14:05:13 -06:00
Max Brunsfeld
be51a58311 Start work on requesting to join projects 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-12 17:53:11 -07:00
Antonio Scandurra
933a1f2cd6 Show badge when there are pending contact requests 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-05-11 17:39:03 +02:00
Nathan Sobo
eef99f059d Make flex elements fill available space when they contain a float 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-05-10 06:14:30 -06:00
Antonio Scandurra
95d848fe1e Ensure flex_float works even when re-painting without layout 
Previously, we were mutating the remaining space stored on the layout
state, which would cause re-paints to always have a `remaining_space`
of 0 and therefore not align `flex_float` elements to the right/bottom.
 2022-05-06 10:20:03 +02:00
Max Brunsfeld
8445eaab85 Fix crash when emptying atlases 
Previously, when an atlas was emptied, we would move it into a different
vector: free_atlases. This removal could cause existing atlas ids to
refer to the wrong atlases.
 2022-05-05 17:52:47 -07:00
Antonio Scandurra
61346f734d WIP 2022-05-05 15:15:58 +02:00
Max Brunsfeld
657ea264cc Allow guests to create files from the project panel 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-05-04 10:28:44 -07:00
Antonio Scandurra
09a8b8e675 Capture crash reports and upload them the next time Zed launches 2022-05-02 15:17:43 +02:00
Antonio Scandurra
cddafa5fef
Merge pull request #940 from zed-industries/telemetry 
Instrument the collab server with OpenTelemetry collecting into Honeycomb.io
 2022-04-29 17:50:55 +02:00
Antonio Scandurra
7ec5c04fdf Correctly alpha-blend border and background in quad SDF 2022-04-28 13:54:18 +02:00
Nathan Sobo
36b462182b Send telemetry to Honeycomb via GRPC 
We updated the core-foundation crates because Tonic (the GRPC crate) relies on a newer version of core foundation to find TLS root certificates.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-04-27 09:58:55 -06:00
Nathan Sobo
1293b21b2d Get db tests passing with Tokio Postgres adaptor 
We now run tests that interact with the real database under a Tokio reactor. We make the tests run multi-threaded so we can block on the main thread on database teardown and still make progress actually tearing down the DB.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-04-26 13:30:21 -06:00
Max Brunsfeld
065734e1de
Merge pull request #898 from zed-industries/track-window-focus 
Focus/blur views when application windows become active/inactive
 2022-04-25 08:54:47 -07:00
Nathan Sobo
ac6880b6ee Only set the cursor style once per mouse move event 
This will hopefully prevent some of the intermittent flickering we seem to be seeing.
 2022-04-22 18:57:49 -06:00
Max Brunsfeld
e8d263274c Remove duplication between windowDid{Become,Resign}Key callbacks 2022-04-22 15:06:50 -07:00
Max Brunsfeld
6b9e93ac6d Fix double-borrow crash by calling window activated callback asynchronously 2022-04-22 15:01:19 -07:00
Max Brunsfeld
7f64076f8d Focus/blur views when application windows become active/inactive 2022-04-22 14:18:50 -07:00
Nathan Sobo
92f040df00 Apply cursor styles during paint 
This makes the editor's cursor an IBeam and properly deals with nested cursor styles.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-04-22 10:54:18 -06:00
Antonio Scandurra
3def7a6803 Avoid flicker when toggling project browser on workspace open 2022-04-22 11:53:45 +02:00
Max Brunsfeld
066b4faf61 Restructure KeyMap file, make it easy to edit in Zed 
Add a JSON schema for this file so that autocomplete can be used for the actions.
 2022-04-21 13:35:10 -07:00
Antonio Scandurra
fb87bacc7e Merge branch 'main' into auto-update 2022-04-21 09:53:06 +02:00
Antonio Scandurra
a210b05d00 Remove App::on_open_files, as it's a subset of on_open_urls 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-04-20 17:36:27 +02:00
Antonio Scandurra
f7055c2acc Implement zed --wait 2022-04-20 17:28:31 +02:00
Max Brunsfeld
fbd1afc51f Add a command for installing the CLI 2022-04-20 17:27:33 +02:00
Nathan Sobo
75f0326e54 Use ipc_channel crate to communicate between cli and app 
We still aren't handling CLI requests in the app, but this lays the foundation for bi-directional communication.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-04-20 17:15:46 +02:00
Antonio Scandurra
01eb2dce24 WIP: Start on a new cli crate 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-04-20 17:15:45 +02:00
Max Brunsfeld
c56e2ead23 Fix hang when dropping ::scoped future under deterministic executor 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-18 17:11:39 -07:00
Max Brunsfeld
d0413ac0e1 Fix crash when dropping a task that is awaiting a call to Background::scoped 
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-18 17:11:39 -07:00