Commit Graph
80 Commits
Author SHA1 Message Date
Nathan Sobo bac0b84dfa Simplify IME support 2023-11-08 21:06:00 -07:00
Max Brunsfeld ffeed40e87 Merge branch 'main' into bounds-for-range 2023-11-08 17:31:00 -08:00
Max Brunsfeld 52d538170b Fix vertical position in first_rect_for_character_range 2023-11-08 17:27:32 -08:00
Max Brunsfeld 3f288f7977 Assign gutter widht on editor view when painting element 2023-11-08 17:01:50 -08:00
Marshall Bowers 3fa42ab59e Hard-code the gutter margin temporarily 2023-11-08 19:25:12 -05:00
Conrad Irwin 800a7adcf2 go to line2 (#3261)
- MODAL
- center a div
- MOAR CODE
- Beautiful go to line modal


Release Notes:
- N/A
2023-11-08 17:16:00 -07:00
Max BrunsfeldandMarshall 44a83ffef2 Account for element's bounds in Editor::bounds_for_range
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-08 16:15:10 -08:00
Max BrunsfeldandMarshall 3497a236c1 Register text input handlers via new element hook
Provide element bounds to the input handler's `bounds_for_rect` method.

Co-authored-by: Marshall <marshall@zed.dev>
2023-11-08 15:48:55 -08:00
Conrad Irwin 282360a8db Refactor GoToLine to use cx.observe_new_views() 2023-11-08 16:23:05 -07:00
Max BrunsfeldandMarshall bc284a96f6 Fix DisplaySnapshot::x_for_point always returning 0
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-08 13:55:39 -08:00
Mikayla 738ca57aba Merge branch 'main' into go-to-line2 2023-11-08 11:32:36 -08:00
Antonio ScandurraandMarshall b7903e2199 Fix blinking behavior in editor when receiving/losing focus
Co-Authored-By: Marshall <marshall@zed.dev>
2023-11-08 19:03:57 +01:00
Marshall Bowers 443543c4a8 Merge branch 'main' into picker 2023-11-08 11:18:54 -05:00
Antonio Scandurra ef746a7850 💄 2023-11-08 15:33:11 +01:00
Antonio Scandurra cdf34d6847 Determine whether the gutter was hovered 2023-11-08 15:30:41 +01:00
Antonio Scandurra 67587e1c9f Handle MouseUpEvent in editor2 2023-11-08 15:17:30 +01:00
Antonio Scandurra 679a424cfa Move building of key listeners outside of EditorElement::initialize 2023-11-08 15:12:54 +01:00
Antonio ScandurraandPiotr 80153eac26 Clear hover background highlights
Co-Authored-By: Piotr <piotr@zed.dev>
2023-11-08 15:08:54 +01:00
Piotr OsiewiczandAntonio 5aca7c134f Uncomment mouse_dragged event
Co-authored-by: Antonio <antonio@zed.dev>
2023-11-08 15:02:35 +01:00
Piotr OsiewiczandAntonio e51bbf5e31 Extract mouse event handlers into paint_mouse_listeners
Co-authored-by: Antonio <antonio@zed.dev>
2023-11-08 14:40:08 +01:00
Piotr OsiewiczandAntonio 88292143b6 Hook up mouse_down function handler
Co-authored-by: Antonio <antonio@zed.dev>
2023-11-08 14:36:05 +01:00
Piotr OsiewiczandAntonio cf2db788b3 Pass text_bounds instead of full editor bounds into mouse_moved.
Co-authored-by: Antonio <antonio@zed.dev>
2023-11-08 14:28:16 +01:00
Piotr Osiewicz 5c2b0222b8 uncomment show_hover 2023-11-08 14:24:28 +01:00
Piotr Osiewicz 3172fe1347 uncomment mouse moved 2023-11-08 14:24:28 +01:00
Antonio Scandurra 00932568f2 Re-enable most of the functionalities in editor2 2023-11-08 11:30:32 +01:00
Nathan Sobo 513c56ca34 Merge remote-tracking branch 'origin/main' into register-actions 2023-11-07 21:56:08 -07:00
Nathan Sobo bcf8a98ff7 Docs and cleanup 2023-11-07 21:26:51 -07:00
Nathan Sobo a2fac01ccf Register actions globally before main 2023-11-07 20:58:37 -07:00
Max Brunsfeld 61c65bcfaf Merge branch 'main' into picker 2023-11-07 16:57:47 -08:00
Max BrunsfeldandMarshall 60c1d02011 Get basic text input working
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-07 16:33:02 -08:00
Max BrunsfeldandMarshall 136c115219 Assign editors as text input handlers
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-07 15:44:00 -08:00
4a89dcfdfc Implement an InputHandler trait for gpui2
Co-Authored-By: Marshall <marshall@zed.dev>
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Julia <julia@zed.dev>
2023-11-07 16:30:04 -07:00
555a4ba002 Beautiful go to line modal
Co-authored-by: Julia <julia@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-07 15:32:34 -07:00
Max BrunsfeldandMarshall ac738e2a04 Get actions + focus working on picker, now that it's a view
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-07 13:48:32 -08:00
Max Brunsfeld ccb92118f1 Merge branch 'main' into picker 2023-11-07 13:37:49 -08:00
Conrad Irwin e2c4392dbf Add text and focus to editor 2023-11-07 14:19:15 -07:00
Conrad Irwin 01143d7c0e Make it possible to render a single line editor 2023-11-07 14:05:23 -07:00
Mikayla Maki a729ad29f1 Merge branch 'main' into picker 2023-11-07 11:44:02 -08:00
Max Brunsfeld 2a38753bb8 Merge branch 'main' into picker 2023-11-07 11:27:14 -08:00
Conrad Irwin 2d9315082c Implement Editor::single_line 2023-11-07 11:12:36 -07:00
Antonio Scandurra 7426071844 Implement movement in editor2 (#3256)
Release Notes:

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

Release Notes:

N/A
2023-11-07 10:56:46 -07:00
Antonio Scandurra 800a03407c Merge remote-tracking branch 'origin/main' into editor-movement 2023-11-07 18:48:08 +01:00
Max Brunsfeld 30580b8abb Merge branch 'main' into picker 2023-11-07 09:34:57 -08:00
Antonio Scandurra fb46fdc925 Merge remote-tracking branch 'origin/main' into editor-movement 2023-11-07 17:54:46 +01:00
Antonio Scandurra fce2c48f31 WIP 2023-11-07 17:54:14 +01:00
Antonio Scandurra 33ff70942d Implement scrolling for editor2 (#3251)
Release Notes:

- N/A
2023-11-07 17:53:57 +01:00
6f2ddc9abe 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
Marshall Bowers a9db13e190 Rename ThemeVariant to Theme (#3252)
This PR renames the `ThemeVariant` type to `Theme`.

This better reflects its purpose, as well as matches the same name as we
had before, which should make porting crates slightly easier.

Release Notes:

- N/A
2023-11-07 10:41:36 -05:00
cfd05d80a7 Clip text when scrolling horizontally
Co-Authored-By: Julia <julia@zed.dev>
Co-Authored-By: Piotr <piotr@zed.dev>
2023-11-07 15:50:18 +01:00