mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-02 08:20:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
656 commits 536 branches 832 tags 222 MiB
Commit graph

222 commits

Author SHA1 Message Date
Max Brunsfeld
5fd084ec09 Start work on creating and saving new files 2021-05-04 19:04:11 -07:00
Nathan Sobo
ed28bd3f95 Combine Workspace and WorkspaceView 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-05-03 20:15:55 -06:00
Max Brunsfeld
5826a976ef Return a future from WorkspaceView::open_paths 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-29 14:55:28 -07:00
Nathan Sobo
6b357a6ae7 Fix tests 
I didn't realize a previous change had broken stuff. We need to always call `remove_dropped_entities` and `update_windows` in `flush_effects`, even if there aren't any effects. To achieve this, I use a `loop` to ensure we call these methods at least once before breaking.
 2021-04-28 14:16:10 -06:00
Max Brunsfeld
21cfb75a73 Flush redundant fs events in worktree test 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-04-28 12:42:39 -07:00
Nathan Sobo
1cb3fdbf7d Synthesize a mouse moved event in the previous position after painting a scene 
This ensures that we correctly update the hover state of elements whose position has changed relative to the mouse cursor even though the mouse hasn't actually moved.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-28 13:02:39 -06:00
Nathan Sobo
b5463dcd1e Close tabs when X is clicked 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-04-28 10:00:45 -06:00
Nathan Sobo
8c51bb253d Render sprited icons at 2x resolution since we don't align to pixel grid 
This provides the sampler with a bit more data when positioning sprites at subpixel positions.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-04-28 09:32:38 -06:00
Nathan Sobo
69cc2b0483 WIP 2021-04-27 18:35:24 -06:00
Nathan Sobo
58e336354e Align close tab icon cleanly with unsaved indicator 2021-04-27 16:51:23 -06:00
Nathan Sobo
eca9f495a1 Render a close tab button on tab hover 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-27 11:58:59 -06:00
Nathan Sobo
bb95d58c79 Relay hover events to tabs 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-27 11:37:14 -06:00
Nathan Sobo
3d1e44ca29 Capture hover events on tabs 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-04-27 09:23:44 -06:00
Nathan Sobo
fc4b7e2a2a Introduce MouseEventHandler 
Still need to give elements the ability to re-render their parent view. Once that is in place, I think we can implement hoverable close tab buttons.
 2021-04-26 21:52:18 -06:00
Nathan Sobo
a47b0b4ca6 Add a mechanism for storing ephemeral values 
I'll use this in the mouse event handler to track hover and click state.
 2021-04-26 21:24:23 -06:00
Max Brunsfeld
55fcc586bc Cancel outstanding fuzzy-matching calls before starting a new one 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-26 16:14:43 -07:00
Max Brunsfeld
09f5c7c23e Fix scrollwheel events in uniformlist 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-26 15:53:38 -07:00
Max Brunsfeld
9fd8acdce7 Use our own scoped_pool implementation 2021-04-20 14:07:36 -07:00
Nathan Sobo
9899614f31 Remove task_done condvar which supported finish_pending_tasks 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-04-20 10:45:42 -06:00
Nathan Sobo
1a8e909a38 Ensure we remove broadcast channels after all conditions resolve 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-04-20 10:43:13 -06:00
Nathan Sobo
dcc2bdfd4c Panic when awaiting conditions on dropped entities 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-04-20 10:36:54 -06:00
Antonio Scandurra
ddd746b9f9 Use env_logger instead of simplelog in tests 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-20 17:34:14 +02:00
Antonio Scandurra
37444acc9c Time out condition after 200ms and add basic unit tests for it 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-20 17:21:29 +02:00
Antonio Scandurra
cd7dccd30c Replace remaining usages of finish_pending_tasks with condition 2021-04-20 12:28:30 +02:00
Nathan Sobo
a4c1fe5a0b WIP: Add a condition method to model and view handles for use in tests 
It returns a future that resolves when the provided predicate returns true. The predicate is called any time the handle's targeted entity calls notify.

Still need to add a timeout and completely remove finsih_pending_tasks.
 2021-04-19 22:01:54 -06:00
Nathan Sobo
db8cce9aa9 Merge branch 'master' into rescan 2021-04-14 22:26:09 -06:00
Max Brunsfeld
3f71867af8 Improve styling of tabs 
* Enforce a min width per tab
* Center the title within tab, regardless of icon
* Render icon over the top of the tab title
* Ensure there is always a fixed minimum amount of filler to the right of all tabs

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-14 15:14:46 -07:00
Max Brunsfeld
36699dc095 Avoid setting constrain min to infinity in Flex layout 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-14 15:14:46 -07:00
Max Brunsfeld
f5752969ab Include constraints in element tree JSON debug output 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-14 15:14:46 -07:00
Nathan Sobo
36e6ed3aef WIP 2021-04-14 12:38:16 -06:00
Nathan Sobo
4cef25eff8 Replace easy-parallel with scoped-pool for path searches 
The easy-parallel crate spawned new threads on each call, which was resulting in way too many threads.

Co-Authored-By: Brooks Swinnerton <934497+bswinnerton@users.noreply.github.com>
 2021-04-14 09:08:52 -06:00
Antonio Scandurra
cf23b0e4a2 Prompt for paths asynchronously to avoid double borrow 2021-04-14 16:30:03 +02:00
Antonio Scandurra
29d2236ed2
Merge pull request #19 from zed-industries/single-global-action-dispatch 
Dispatch global actions only once when triggering a menu item
 2021-04-14 15:50:07 +02:00
Antonio Scandurra
f755cbbe98 Dispatch global actions only once when triggering a menu item 
Previously we would dispatch the same global action more than once
because we would invoke `dispatch_action_any` _and_
`dispatch_global_action_any`. However, the former already takes care of
going through the global action handlers when no entity in the dispatch
path handled the action.
 2021-04-14 14:47:18 +02:00
Antonio Scandurra
40980edffe Merge branch 'master' into copy-paste 2021-04-14 12:05:52 +02:00
Nathan Sobo
0cc5e8f742 Replace easy-parallel with scoped-pool for path searches 
The easy-parallel crate spawned new threads on each call, which was resulting in way too many threads.

Co-Authored-By: Brooks Swinnerton <934497+bswinnerton@users.noreply.github.com>
 2021-04-13 20:07:42 -06:00
Nathan Sobo
0a2d2aa684 Replace app/app_mut on contexts with AsRef/AsMut impls 
Co-Authored-By: Brooks Swinnerton <934497+bswinnerton@users.noreply.github.com>
 2021-04-13 20:07:25 -06:00
Max Brunsfeld
c83f02dd04 Implement multi-selection copy/cut/paste 2021-04-13 17:28:51 -07:00
Antonio Scandurra
13514aae6c Allow metadata to be associated with text written to clipboard 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-04-13 19:03:56 +02:00
Antonio Scandurra
f4c1ffc329 Start on copy-paste 2021-04-13 14:58:10 +02:00
Max Brunsfeld
902b0f7dfa Dispatch menu commands on the focused view 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 15:42:33 -07:00
Max Brunsfeld
d4436f3018 Don't try to handle errors when opening platform windows 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 15:14:25 -07:00
Max Brunsfeld
86c0f41c9e Move set_menus method to MutableAppContext 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 14:38:18 -07:00
Max Brunsfeld
41358f34e3 Set up menu handler in App::new 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 14:25:00 -07:00
Max Brunsfeld
2332b7e06b Move open command handler to workspace global action 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 14:18:24 -07:00
Max Brunsfeld
3247f49954 Allow menu items to specify arguments for their commands 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 14:09:49 -07:00
Nathan Sobo
b9b511148b Make gpui::platform module private 2021-04-10 00:22:45 -06:00
Nathan Sobo
619e2b7e01 Remove platform::mac::runner 2021-04-10 00:19:25 -06:00
Nathan Sobo
4638391412 Remove MutableAppContext::downgrade 2021-04-10 00:14:26 -06:00
Nathan Sobo
620eedb727 Allow effects to be flushed before TestAppContext::update callback completes 2021-04-10 00:11:13 -06:00
Nathan Sobo
97a8a8ed43 Remove unsafe code from App::test_async 
I don't actually think it was correct to allow the future to borrow a mutable app reference. I went back to passing a wrapper around the refcell to async tests. They'll be a bit more annoying to write but also totally safe.
 2021-04-10 00:05:09 -06:00
Nathan Sobo
448dace281 Pass the on_finish_launching callback to Platform::run 2021-04-09 21:33:17 -06:00
Max Brunsfeld
079050541f Get app running and test passing after gpui App+Platform restructure 2021-04-09 16:56:32 -07:00
Nathan Sobo
4ecc17b1bb WIP: Make App the only entry point from main 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-09 13:38:09 -06:00
Nathan Sobo
301163bab7 Add lifecycle methods to Platform trait 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-09 13:03:26 -06:00
Max Brunsfeld
00d7dafbba Merge branch 'master' into menus 2021-04-09 10:34:21 -07:00
Max Brunsfeld
7ebcbdc0cb Implement File > Open menu item 2021-04-08 22:25:54 -07:00
Max Brunsfeld
f656b387b3 Call SetActivationPolicy at the proper time 
If this method is called too early, the menu bar won't be
clickable on startup until the window loses focus. Calling
it once the application finishes launching seems to fix
the issue.

See https://github.com/glfw/glfw/issues/1648
 2021-04-08 16:11:45 -07:00
Max Brunsfeld
334de06322 Create an API for assigning the menubar contents 2021-04-08 16:01:36 -07:00
Nathan Sobo
9f6f27f305 Order debug JSON and allow elements to be named; copy to clipboard 2021-04-07 21:54:14 -06:00
Nathan Sobo
cbb23a93a6 Log prettified element debug JSON to on cmd-alt-i 2021-04-07 21:54:14 -06:00
Nathan Sobo
0664321125 Add ability to debug element trees as JSON 2021-04-07 21:54:14 -06:00
Max Brunsfeld
0a12774680 Add a stub of a native 'File' menu 2021-04-07 17:49:44 -07:00
Max Brunsfeld
7e5186e4a0 Start work on a native application menu 
Add an application menu with a quit command, bound to command-q
 2021-04-07 17:48:22 -07:00
Max Brunsfeld
187eb95b13 Throw a little between filename and modified icon 
We probably need a primitive to right-align an element within
its parent, but I don't have strong opinions about how that
should be designed, so I'm just adding this as a temporary
measure so that the tabs won't look too ugly in the meantime.
 2021-04-07 15:39:09 -07:00
Nathan Sobo
13ee86e334 Remove unused method 2021-04-06 20:47:09 -06:00
Max Brunsfeld
dabd6abe37 Start work on displaying modified status in tabs 2021-04-06 14:37:21 -07:00
Max Brunsfeld
0f157d5083 Silence warning in text example 2021-04-06 14:36:16 -07:00
Max Brunsfeld
c632aab382 Vertically center linebox child element 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-06 13:03:19 -07:00
Nathan Sobo
2a9e71d725 Vertically center glyphs in Line::paint based on ascender/descender for line 2021-04-06 09:15:21 -06:00
Nathan Sobo
fc4135d55b Render example text in example via Line::paint 2021-04-06 09:15:21 -06:00
Nathan Sobo
765c3f9c18 Open platform window before first invalidation 
This ensures we have an invalidation handler present so we render the first frame in all cases.
 2021-04-06 09:15:21 -06:00
Nathan Sobo
a5b39220a4 WIP: Add example app to test text rendering 2021-04-06 09:15:21 -06:00
Antonio Scandurra
5f1f49b011 Reduce path atlas size by using a single channel for the texture 2021-04-06 13:53:20 +02:00
Antonio Scandurra
e0c43dac25 Implement SVG rendering 2021-04-06 13:46:33 +02:00
Nathan Sobo
2970e934da Use handles to obtain entities in future callbacks 
This guarantees that the spawning entity will be present and simplifies
the logic for obtaining the entity. Now we can forward the results of spawned futures and streams in the same way regardless of whether what spawned them was a model or a view.
 2021-04-05 20:04:04 -06:00
Max Brunsfeld
fda1394057 Rename Task -> EntityTask (a BackgroundTask is just a Task) 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-05 17:03:42 -07:00
Max Brunsfeld
c39c7c3eff Make background executor available on AppContext 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-05 16:45:55 -07:00
Max Brunsfeld
dba3c82530 Remove stray print statements 2021-04-02 15:00:20 -07:00
Max Brunsfeld
575f5910fa Use a real FontSystem in test platform 2021-04-02 14:35:44 -07:00
Max Brunsfeld
dd31b870c3 Remove small pieces of unused code 2021-04-02 14:26:53 -07:00
Nathan Sobo
c43d7cfb39 Use a condvar instead of a channel to implement finish_pending_tasks 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-02 13:53:06 -06:00
Nathan Sobo
526a55d0d7 Complete finish_pending_tasks future when tasks are cancelled 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-02 12:42:23 -06:00
Nathan Sobo
fd1f75333f Initialize logger in gpui tests 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-02 12:42:01 -06:00
Nathan Sobo
2d79193fb6 Remove future/stream handlers when task is dropped 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-02 12:03:35 -06:00
Nathan Sobo
914cf37f37 Remove executor::ForegroundTask wrapper 
Now that smol returns the same Task as async_task, we can simply re-export the async_task::Task struct from our executor module.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-02 11:02:09 -06:00
Nathan Sobo
d68a747754 Fix hanging finish_pending_tasks test 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-02 10:48:03 -06:00
Antonio Scandurra
72ced45df0 Remove unused edge_to_point calculation in quad shader 2021-04-02 13:53:11 +02:00
Antonio Scandurra
d10fc6ce3f Fix crash when selections exceed the container's bounds 2021-04-02 13:49:44 +02:00
Nathan Sobo
995acefce5 Inset container contents to account for container border 2021-04-01 10:31:00 -06:00
Antonio Scandurra
e487aa5cbd Don't render glyphs located outside of BufferElement's bounds 2021-04-01 11:19:50 +02:00
Nathan Sobo
c525d7c712 💄 naming 2021-03-31 20:43:15 -06:00
Max Brunsfeld
3bd6b92244 Introduce a GPUI test platform, get most tests running 
There are still two tests that don't pass:
* `gpui::app::tests::test_finish_pending_tasks` hangs
* `editor::buffer_view::tests::test_fold` has an assertion failure
 2021-03-31 17:03:58 -07:00
Max Brunsfeld
2efc90adc6 Ensure that path windings are rendered to the right atlas texture 
Fixes #5
 2021-03-31 14:52:41 -07:00
Antonio Scandurra
a9c428ad05 Remove Overdraw 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-03-31 17:58:43 +02:00
Antonio Scandurra
d5a9bab4a0 Fix tabs layout 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-03-31 17:57:00 +02:00
Antonio Scandurra
97e0db205d Don't blend alpha channels 
We want to use the source alpha to determine the color of the final
pixel, but we want the final pixels to be fully opaque.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-03-31 16:24:28 +02:00
Antonio Scandurra
385d15cd0c Round clip bounds to whole pixels 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-03-31 16:23:37 +02:00
Antonio Scandurra
d853dbb048 Render borders correctly when only a subset of the border is visible 2021-03-31 14:53:34 +02:00
Antonio Scandurra
073ff96a9f Snap quads to pixel grid to avoid antialiasing them around the edges 2021-03-31 14:53:15 +02:00