Commit Graph
1156 Commits
Author SHA1 Message Date
Nathan Sobo e74039336d Merge pull request #1764 from zed-industries/gpui-events
Eliminate dispatch_event on Element trait
2022-10-18 15:24:13 -06:00
Mikayla Maki c59df65e85 Merge branch 'main' into breadcrumbs 2022-10-17 16:51:38 -07:00
K SimmonsandMikayla Maki 456c3cad4b Pull blink functionality out of editor and into blink manager. Make blink manager subscribe to settings changes in order to start blinking properly when it is re-enabled.
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-17 16:20:51 -07:00
K Simmons 55b9eff3df Add cursor blink setting and replicate cursor shape to remote collaborators 2022-10-17 16:20:47 -07:00
Mikayla Maki 5afbcffaa3 Merge branch 'main' into gpui-events 2022-10-17 15:43:41 -07:00
Mikayla Maki ca2409e9bf Resovled behavioral inconsistency with how projects with multiple roots are handled 2022-10-17 13:08:05 -07:00
Mikayla Maki f23f3ad9f8 fixed a bug where files outside of the project would show 'untitled' in the search bar 2022-10-17 12:58:48 -07:00
Julia a2e05e3a47 Merge pull request #1768 from zed-industries/git-gutter-meets-code-folding
Git gutter meets code folding (and word wrap fixes)
2022-10-17 14:51:47 -04:00
Julia 5d60592d49 Cleanup 2022-10-17 14:41:16 -04:00
Julia bc4eb620c4 Inclusively check for hunk in fold range 2022-10-17 13:11:11 -04:00
Julia 4298ebd940 Deduplicate identical hunk layouts 2022-10-17 12:41:20 -04:00
Julia 0514ed1976 More concrete usage of display map to handle diff hunk gutter layout 2022-10-17 12:28:44 -04:00
Nathan Sobo f26a6179b4 Remove dispatch_event from Element trait 2022-10-16 13:08:25 -06:00
Nathan Sobo 25476bcbc6 Move handling of modifier changes to new View hook 2022-10-16 12:47:48 -06:00
Nathan Sobo 6c870a17a6 Start on view-level dispatch approach for keyboard events 2022-10-16 11:46:31 -06:00
Nathan Sobo 3e27b81d17 Merge pull request #1762 from zed-industries/less-click-and-hover-invalidation
Reduce unnecessary view invalidations related to mouse events
2022-10-16 10:23:54 -06:00
Nathan Sobo d2431d9540 Merge pull request #1761 from zed-industries/mouse-region-view-invalidation
Remove unconditional invalidation when calling mouse region handlers
2022-10-14 18:31:23 -06:00
Nathan SoboandMax Brunsfeld f80f306ad8 Avoid re-rendering editor on mouse move
Only notify editor when clearing highlights if there were highlights to
begin with.

Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-14 18:27:55 -06:00
Nathan SoboandMax Brunsfeld 4aff034ff5 Only invalidate parent view on click/hover if we read that state when rendering
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-14 18:09:15 -06:00
Nathan Sobo 5c0f9e5c51 Remove unconditional invalidation when calling mouse region handlers
We want invalidation to opt-in as much as possible.
If you want a view to re-render, you need to call `cx.notify`.
2022-10-14 17:06:46 -06:00
JuliaandKay Simmons 1eaeba3fc8 WIP
Co-Authored-By: Kay Simmons <kay@zed.dev>
2022-10-14 17:14:33 -04:00
Mikayla Maki 7ae0ac843a Finished implementing vscode, emacs, and mac style pageup/down. Added keybindings ctrl-v, alt-v for emacs up/down and shift-pageup, shift-pagedown for vscode style. Also improved incorporated pageup/down into context menus 2022-10-14 13:52:30 -07:00
Max BrunsfeldandMikayla Maki 7c96e0d6e6 Add MovePageUp and MovePageDown editor commands
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
2022-10-14 12:36:46 -07:00
Max BrunsfeldandMikayla Maki db9bd61f0d Enable auto-scroll when moving cursors in Editor::handle_input
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
2022-10-14 11:32:22 -07:00
Max BrunsfeldandNathan Sobo eb0c82b733 Consolidate calculation of editor's visible row range
We think this will fix a panic that was occuring in `paint_highlighted_range`
due to an out-of-bounds read into the line layouts. We think doing essentially the same
calculation in two different ways with floating point numbers might have
caused a different end row to be calculated in 2 different code paths.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-10-14 10:37:44 -07:00
Max Brunsfeld e5d18be301 Avoid skipping over a different closing bracket in autoclose 2022-10-14 09:30:30 -07:00
JuliaandMax Brunsfeld 5fdc498e61 Quick cut of using display point conversion to layout hunks
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-10-13 16:34:34 -04:00
Julia 5504e57503 Clean 2022-10-13 15:23:41 -04:00
Julia 26088bede5 Expand diff gutter indicator to cover all of a wrapped line 2022-10-13 14:05:57 -04:00
Julia 7abe6bfd4a Use correct range to get diff hunks in the presence of wrapped lines 2022-10-13 13:52:44 -04:00
Antonio Scandurra 42e2594058 Log view name alongside error in ChildView 2022-10-13 15:44:01 +02:00
Julia bdb96d4616 Misc fixes, still broken soft wrap 2022-10-13 02:02:29 -04:00
Julia 7ab8f55c11 Include deletion hunks in fold regardless of end 2022-10-13 00:42:53 -04:00
Max Brunsfeld a2c9a67558 Re-export basic text types from text and language crates
Also avoid production dependencies on fs and rope in collab
2022-10-12 15:48:19 -07:00
Julia bd59b51daa Correctly offset diff hunk layouts 2022-10-12 16:40:19 -04:00
2b192ff9b3 Fix rounding error in computing editor's row range during layout
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
2022-10-12 09:19:29 -07:00
Julia 1d8638ae71 Something's happening, nothing correct, but something 2022-10-12 00:39:56 -04:00
Mikayla Maki fa862550fd Merge branch 'main' into test-branch 2022-10-11 19:55:32 -07:00
Max Brunsfeld 7a82fb7aaf Impose min scrollbar height in a way that doesn't impede scrollbar's movement
Also, fix the editor's scroll max so that you can scroll to the last
display row.
2022-10-11 18:50:04 -07:00
Kay Simmons 394517dbc6 Merge pull request #1685 from zed-industries/vim-text-objects
Vim Text Objects and Numeric Repitions
2022-10-11 16:36:19 -07:00
Mikayla Maki a9ce687031 Finished refactoring out fs and rope 2022-10-11 15:25:54 -07:00
Max Brunsfeld 245db0b084 Merge pull request #1715 from zed-industries/scrollbars
Add scrollbars
2022-10-11 13:34:15 -07:00
Max Brunsfeld bf110bce35 Impose a minimum height on the scrollbar 2022-10-11 13:18:33 -07:00
Antonio Scandurra 8be22e9b6f Merge pull request #1700 from zed-industries/room
Introduce call-based collaboration
2022-10-11 17:40:44 +01:00
Max Brunsfeld 71f4ef2e82 Refresh scrollbar auto-hide setting when opening a new editor 2022-10-11 09:28:17 -07:00
Max Brunsfeld 1a042ca098 Hide the scrollbar track, not just the thumb 2022-10-11 09:26:19 -07:00
Max Brunsfeld 4c9e2492a0 Enable/disable scrollbar auto-hide based on OS setting 2022-10-11 09:13:34 -07:00
Antonio ScandurraandNathan Sobo 0486263204 Decide whether to clip to visible bounds on a per-element basis
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-11 17:05:13 +02:00
Max Brunsfeld 8c7857f940 Auto-hide scrollbars 2022-10-10 17:54:29 -07:00
Max Brunsfeld 44f1162002 Represent scrollbar range with f32s 2022-10-10 17:06:48 -07:00