Commit Graph
1217 Commits
Author SHA1 Message Date
Nathan Sobo 379652f074 Merge branch 'main' into cells 2023-08-03 19:33:04 -06:00
Nathan Sobo 2d96388be3 Use WindowHandles in a couple places 2023-08-03 17:46:34 -06:00
Nathan Sobo 485c0a482e Don't refcount window handles 2023-08-03 17:11:47 -06:00
Nathan Sobo afcc0d621b WIP 2023-08-03 17:03:39 -06:00
Nathan Sobo 3c938a7377 WIP 2023-08-03 08:10:16 -06:00
Nathan Sobo 8e36da1382 Get tests passing 2023-08-02 15:02:55 -06:00
Nathan Sobo 884cee6dfd Get tests compiling returning WindowHandle<V: View> from add_window 2023-08-02 14:05:03 -06:00
Nathan Sobo 60e190e500 WIP 2023-08-02 12:08:56 -06:00
Max Brunsfeld a555fa1ada Merge branch 'main' into collab-panel 2023-08-02 09:08:50 -07:00
Nathan Sobo 300ce61bd0 WIP 2023-08-02 08:25:40 -06:00
Nathan Sobo b695c42e11 WIP: Return WindowHandle<V: View> from AppContext::add_window 2023-08-01 22:28:04 -06:00
Nathan Sobo 1dfde8eab5 WIP 2023-08-01 20:53:15 -06:00
Kirill Bulatov 646dabe113 Add buffer search history 2023-08-01 01:31:28 +03:00
Nathan Sobo 6f6096238d WIP 2023-07-28 16:44:15 -06:00
Nathan Sobo 6d10328796 WIP 2023-07-28 15:29:29 -06:00
Nathan Sobo 4d66c3237d WIP 2023-07-28 15:01:45 -06:00
Max Brunsfeld 969ecfcfa2 Reinstate all of the contacts popovers' functionality in the new collaboration panel 2023-07-28 13:24:43 -07:00
Mikayla Maki 7f9df6dd24 Move channels panel into collab and rename to collab panel
remove contacts popover and add to collab panel
2023-07-28 13:24:42 -07:00
Mikayla Maki fe5db3035f move channels UI code to channels-rpc 2023-07-28 13:21:41 -07:00
Mikayla Makiandnate ac35dae66e Add channels panel with stubbed out information
co-authored-by: nate <nate@zed.dev>
2023-07-28 13:21:39 -07:00
Nathan Sobo dc8e7acca0 WIP 2023-07-27 23:52:41 -06:00
Nathan Sobo 239024acd6 WIP 2023-07-27 23:26:12 -06:00
Nathan Sobo 33e49b4962 WIP 2023-07-27 23:00:52 -06:00
Nathan Sobo 480401d65d WIP 2023-07-27 18:23:23 -06:00
Nathan Sobo 2ef19e48bc WIP 2023-07-27 13:00:28 -06:00
Nathan Sobo 70c9959ebc WIP 2023-07-27 12:35:54 -06:00
Nathan Sobo ab8906551d WIP 2023-07-26 22:37:59 -06:00
Mikayla Maki 354c020612 Block extra drag events in original drag handlers 2023-07-26 14:57:46 -07:00
Nathan Sobo c602d98680 WIP 2023-07-26 13:34:57 -06:00
Nathan Sobo 0374bc66ce WIP 2023-07-26 12:54:23 -06:00
Mikayla Maki a58c9ed7d3 fmt 2023-07-26 09:39:35 -07:00
Nathan Sobo c48d8af204 Merge branch 'paint-context' into cells 2023-07-25 17:36:05 -06:00
Nathan Sobo 1b03c5d69c Pass PaintContext to Element::paint
I want to use this on another branch, but it's a sweeping change,
so this prepares the ground for it. This can always be reverted if
it doesn't work out.
2023-07-25 17:32:31 -06:00
Nathan Sobo df9c17176e WIP 2023-07-25 16:33:58 -06:00
Nathan Sobo 54a7419fa2 WIP 2023-07-24 23:27:14 -06:00
Mikayla Maki 429a2fc623 Add drag end events
Fix left dragging cascade
WIP: Implement right dragging, WIP: use drag end events to set and reset state around initial flex orientation
2023-07-23 13:28:30 -07:00
Julia 0b6155609d In macOS platform layer map a ctrl-click to a right click (#2755)
Maps a ctrl left down event into a ctrl-less right down and then up pair
and filters out ctrl left up. Hopefully this ensures that mouse down/up
events remain balanced and somewhat matching.

Release Notes:
- Added the ability to ctrl-click in place of right click to summon
context menus
([#1150](https://github.com/zed-industries/community/issues/1150)).
2023-07-20 14:54:55 -04:00
Kirill Bulatov a5e63fbf77 Properly display keybindings in context menus 2023-07-20 12:18:04 +03:00
Julia 2e3aa703d9 In macOS platform layer map a ctrl-click to a right click 2023-07-19 15:43:45 -04:00
Nathan Sobo 19e4cad7a9 WIP 2023-07-18 13:32:07 -06:00
Nathan Sobo 18b0385d73 WIP 2023-07-17 16:48:31 -06:00
Nathan SoboandDerek Briggs f5682a3cb5 Paint basic children
Co-Authored-By: Derek Briggs <derek.briggs@me.com>
2023-07-17 16:39:58 -06:00
Kirill BulatovandMax Brunsfeld a4bf19c5bd Simplify NoAction filtering logic
co-authored-by: Max Brunsfeld <max@zed.dev>
2023-07-17 20:42:35 +03:00
Kirill Bulatov 4cc06748c9 Ignore keybindings with NoAction in config overrides 2023-07-17 18:34:39 +03:00
Kirill Bulatov eaa8224076 Use id instead of type_id for actions
Currently, both are the same thing, so the logic is not changed.
2023-07-17 12:24:56 +03:00
Nathan SoboandDerek Briggs 248f5dfd4b Get a red box on screen
Co-Authored-By: Derek Briggs <derek.briggs@me.com>
2023-07-14 17:03:07 -06:00
Nathan SoboandDerek Briggs 87bafb04e2 Get playground app launching
Not sure if it should be in the workspace, but it's easier for now.

Co-Authored-By: Derek Briggs <derek.briggs@me.com>
2023-07-14 15:34:31 -06:00
Nathan Sobo 4b2054215a Get cell compiling 2023-07-14 15:20:53 -06:00
Nathan Sobo 0db8f681ba WIP 2023-07-14 11:58:43 -06:00
Mikayla Maki 26b9be628e Add the math for pane resizing 2023-07-12 22:35:51 -07:00