Commit Graph
604 Commits
Author SHA1 Message Date
Max Brunsfeld d690fb038d Merge branch 'main' into picker 2023-11-07 11:27:14 -08:00
Conrad Irwin b804b25c21 Fix confusing error message 2023-11-07 12:04:21 -07:00
Max BrunsfeldandMikayla 6928ad1335 Rename List -> UniformList
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-11-07 11:00:53 -08:00
Max BrunsfeldandMikayla 742180a3a8 Implement list scroll tracking
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-11-07 10:45:38 -08:00
Conrad Irwin 3a72f2122a Implement Editor::single_line 2023-11-07 11:12:36 -07:00
Antonio Scandurra 4bf3a4e3d4 Implement movement in editor2 (#3256)
Release Notes:

- N/A
2023-11-07 19:12:09 +01:00
Conrad Irwin c89d6eb292 modals2 (#3247)
New Modal implementation for gpui2

Release Notes:

N/A
2023-11-07 10:56:46 -07:00
Antonio Scandurra d7e86eb1c1 Merge remote-tracking branch 'origin/main' into editor-movement 2023-11-07 18:48:08 +01:00
Max Brunsfeld 69eb49a2ed Merge branch 'main' into picker 2023-11-07 09:34:57 -08:00
Antonio Scandurra 2697862a02 Merge remote-tracking branch 'origin/main' into editor-movement 2023-11-07 17:54:46 +01:00
Antonio Scandurra 82a018996b WIP 2023-11-07 17:54:14 +01:00
Antonio Scandurra 64b899c68c Implement scrolling for editor2 (#3251)
Release Notes:

- N/A
2023-11-07 17:53:57 +01:00
643146d768 Re-introduce a macro for defining actions for ease of use
Co-Authored-By: Piotr Osiewicz <piotr@zed.dev>
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-07 11:30:58 -05:00
a2a28af052 Add Modals
P.S. this is all completely different now

Co-Authored-By: Marshall <marshall@zed.dev>
Co-Authored-By: Julia <julia@zed.dev>
2023-11-07 09:18:34 -07:00
Conrad Irwin 2e43015664 gpui event test (#3249)
- Flesh out gpui2 test support
- Smoke test for event handling
2023-11-07 08:43:15 -07:00
Conrad Irwin 6f74854525 Fix event ordering issues 2023-11-07 08:29:55 -07:00
b9e98c112f Re-enable scrolling for EditorElement
Co-Authored-By: Julia <julia@zed.dev>
Co-Authored-By: Piotr <piotr@zed.dev>
2023-11-07 15:48:08 +01:00
Antonio Scandurra 268be71d8e Add colors for document highlights 2023-11-07 13:15:08 +01:00
Antonio Scandurra bdf6e8bcc7 Merge remote-tracking branch 'origin/main' into editor2-paint 2023-11-07 13:09:48 +01:00
Antonio Scandurra a866370dc1 Paint lines 2023-11-07 12:25:33 +01:00
Conrad Irwin a7d52ee86f Smoke test for event handling 2023-11-06 21:05:22 -07:00
Conrad Irwin 8e799b6e22 Flesh out gpui2 test support 2023-11-06 21:05:11 -07:00
85000eba81 wip: picker
co-authored-by: nathan <nathan@zed.dev>
co-authored-by: max <max@zed.dev>
2023-11-06 17:09:38 -08:00
Mikayla 3c93b585ab Checkpoint 2023-11-06 15:11:22 -08:00
Mikayla ea6755b1ca Checkpoint 2023-11-06 14:26:10 -08:00
Mikayla 3f7dc59512 Snapshot for kirill 2023-11-06 12:33:20 -08:00
Mikayla 75a80811b3 WIP 2023-11-06 11:18:56 -08:00
Conrad Irwin 496518f3e8 Use gpui instead of gpui2 consistenytly 2023-11-06 11:50:33 -07:00
Mikayla d66ed4310f WIP: change over background executor test helpers 2023-11-06 10:16:08 -08:00
Conrad Irwin c59817cd72 Merge branch 'main' into editor2-rendering 2023-11-06 11:06:43 -07:00
Conrad Irwin d88dccffbc Allow multiple subscriptions from one entity handle 2023-11-06 11:03:14 -07:00
Antonio Scandurra e460f6a27c WIP 2023-11-06 18:59:46 +01:00
Antonio Scandurra 769526a76a Paint editor background 2023-11-06 15:54:09 +01:00
Conrad Irwin de5458cfe0 Update tooltip code a bit
This fixes a tiny UX bug where the tooltip would appear to move if you
hovered over an element, then moved your mouse out and back within
500ms.

The fix is to retain the task, so we can drop it to cancel it when the
mouse leaves.

Also changes the time we construct the tooltip to the time it first
shows.
2023-11-03 21:40:28 -06:00
Mikayla e1525e2b47 Get collab2 green 2023-11-03 18:01:06 -07:00
Max Brunsfeld 436dc93441 WIP2000 2023-11-03 16:40:37 -07:00
JuliaandConrad Irwin 4725cd2cd6 Move more tooltip logic into gpui2 & fix tooltip moving on paint
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-03 18:37:15 -04:00
JuliaandConrad Irwin 3834e26f71 Tooltips in mouse event handler & fix executor timer
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-03 18:02:58 -04:00
Conrad Irwin f97046b86f MOAR TOOLTIPS 2023-11-03 14:15:32 -06:00
Conrad IrwinandJulia 33245d119e Tooltip on tabs
Co-Authored-By: Julia <julia@zed.dev>
2023-11-03 14:02:46 -06:00
Mikayla 2b883bf32e WIP 2023-11-03 12:04:24 -07:00
Conrad Irwin 26e64fb843 gpui2: Add on_hover events 2023-11-03 12:51:38 -06:00
Max BrunsfeldandMarshall b085569b46 Add channel2 crate
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-03 10:41:41 -07:00
Conrad Irwin d73c54f604 Add PointingHand on tabs 2023-11-03 11:30:15 -06:00
c604a2e34e Add hover behaviour to tabs
Co-Authored-By: Marshall <marshall@zed.dev>
Co-Authored-By: Nathan <nathan@zed.dev>
2023-11-03 10:55:07 -06:00
Antonio Scandurra d3b02c4de4 WIP: start on editor element 2023-11-03 17:14:17 +01:00
Conrad IrwinandJulia 580694dbda Fix bug when unsubscribe called after remove
Co-Authored-By: Julia <julia@zed.dev>
2023-11-03 09:56:35 -06:00
Antonio Scandurra feaab953a8 Add ViewContext::window_context 2023-11-03 14:41:37 +01:00
Antonio Scandurra bed10b433a Allow converting from a WeakView<V> to an AnyWeakView 2023-11-03 11:36:18 +01:00
Antonio Scandurra 11feda01e3 Uncomment Editor::new 2023-11-03 10:38:28 +01:00