Commit Graph
2855 Commits
Author SHA1 Message Date
Antonio Scandurra 65ddc77fa6 Add control to toggle screen-sharing 2022-10-19 10:19:20 +02: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
Joseph T Lyons 34bc185fcb Merge branch 'main' into settings-for-journal 2022-10-16 12:42:18 -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 Brunsfeld 3c75538be9 Allow toggling collaboration menu from the keyboard 2022-10-12 14:14:03 -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
K Simmons edc2c90c3e working quote and bracket text objects 2022-10-11 15:17:29 -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
K Simmons 713c2c4ae8 fix minor issue where undo is not available in visual mode 2022-10-10 15:34:40 -07:00
JuliaandMikayla Maki b8e48894b5 Don't select on copy by default in the terminal
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-10 13:48:56 -04:00
Antonio Scandurra 8f7a5aea50 Remove menu bar extra 2022-10-10 18:21:11 +02:00
Antonio Scandurra 794bea8dbd Merge remote-tracking branch 'origin/main' into room 2022-10-10 15:43:38 +02:00
K Simmons 055a8fe14a Fixed some neovim test context issues, added repeated commands in vim mode, and ported some tests to use the neovim testing strategy 2022-10-08 21:52:07 -07:00
K Simmons bda6e5fdb7 Adds word and sentence text objects along with a new vim testing system which uses cached neovim data to verify our test accuracy 2022-10-08 21:51:49 -07:00
Antonio Scandurra f3b459ede5 Move contacts panel features into collab_ui 2022-10-06 14:00:14 +02:00
Mikayla Maki bb80bd45bf Removed debugs, simplified settings 2022-10-03 17:43:05 -07:00
JuliaandMikayla Maki fb3c69db37 Move git gutter settings out of editor settings
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 14:53:33 -04:00
Mikayla Maki 47bdc1803e Added clarification for git gutter settings 2022-10-02 18:42:03 -07:00
Mikayla Maki dac3ea36df Touched up settings text 2022-10-02 18:35:19 -07:00
Joseph T Lyons a750ebe868 Change journal location setting name to "path" and default to ~ 2022-09-29 17:12:57 -04:00
JuliaandMikayla Maki f53a544038 Avoid racing git diffs & allow for "as fast as possible" diff updating
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Joseph T Lyons e696ffcd2b Add descriptions to journal settings 2022-09-28 16:52:15 -04:00
Joseph T Lyons 52b1f60b87 Initial work to add settings to journal feature 2022-09-28 16:25:37 -04:00
Mikayla Maki 77ffcad7d1 Merge pull request #1659 from zed-industries/terminal-selections
Terminal Touch ups
2022-09-26 20:58:36 -07:00
Mikayla Maki 29576fd57e Added a SendKeystroke action and rewrote terminal actions to remove duplication 2022-09-26 20:39:40 -07:00
Julia 34fbb8a2bd Re-enable format on save by default 2022-09-26 14:04:25 -04:00
Julia 884b6728a7 Backward compat format settings 2022-09-26 11:41:31 -04:00
Julia 018a737961 Add editor action to manually invoke buffer format 2022-09-22 18:21:05 -04:00
Kay Simmons b06bd3d923 Merge pull request #1634 from zed-industries/dock-tweaks
Dock Tweaks
2022-09-19 09:02:43 -07:00
K Simmons 0cc77e87ff Fix dock keybindings 2022-09-16 16:41:57 -07:00
K Simmons 2a0828de6f Minor improvements to dock visuals, rework dock keybindings, and fix panic on split when dock is active 2022-09-16 12:55:36 -07:00
Antonio Scandurra a4f2fa0d27 Merge branch 'main' into capture 2022-09-15 12:02:07 +02:00
Kay Simmons 2b68c3b129 Merge pull request #1614 from zed-industries/dock
Dock
2022-09-14 12:40:59 -07:00
K SimmonsandMikayla Maki 996c32f045 Fix incorrect rendering of toolbar in right anchored dock
Make dock keybinding activate the dock if it wasn't hidden, and hide it if it was already active
Make clicking the expanded dock wash, hide the dock
Fix some issues with programmatically activating other panes, not hiding the dock
Tweak dock anchor menu text
Swap dock hide button for thin variant
Fix dock sidebar interactions
Add clicked state to search button and fix presenter issue sending clicked events when mouse not overlapping MouseRegion

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-13 15:17:27 -07:00
Mikayla Maki b98a136af9 finished option as meta 2022-09-13 09:41:01 -07:00
Antonio Scandurra d37b230a74 Show the correct icon in status bar 2022-09-13 17:00:46 +02:00
Antonio Scandurra 5d71285bc8 Start on a real status bar item implementation 2022-09-13 14:51:00 +02:00
Mikayla Maki fa5fc91f35 WIP began changing key modifiers 2022-09-12 22:40:35 -07:00
K SimmonsandMikayla Maki 017f7b75cf DOCK WORKING!
Update editor element to use mouse regions instead of dispatch event for mouse events
Fix bug in presenter where mouse region handlers were stored on click and called instead of more up to date handlers from subsequent renders
Changed MouseRegion to require discriminants in all cases
Add scroll wheel event to MouseRegion
Polished a bunch of dock inconsistencies

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-11 15:32:20 -07:00
K Simmons cf46cd4b62 Swapped keyboard binding and did some minor tweaks to style and focus 2022-09-11 15:31:44 -07:00
Mikayla Maki 72e09030d7 Merge pull request #1618 from zed-industries/add-dock-icons
Add dock icons
2022-09-08 16:57:18 -07:00
Mikayla Maki 5fcbc2cbe6 Fixed keymap file 2022-09-08 16:42:00 -07:00
Mikayla Maki fda2640a16 Added internal keymaps as well, just for the hell of it 2022-09-08 16:37:04 -07:00
Mikayla Maki 97b12863bd Removed stray compiled theme files 2022-09-08 15:51:39 -07:00
Mikayla Maki c5344552c5 Finished internal themes 2022-09-08 15:06:08 -07:00
Mikayla Maki a8a195952d Updated theme compilation to use internal 2022-09-08 14:34:21 -07:00
Nate Butler 60587b6a7d Add diff icon 2022-09-08 16:14:43 -04:00
Nate Butler a19ecf69a2 Add dock icons 2022-09-08 16:14:32 -04:00
Mikayla Maki 1f4cc69927 restore modal terminal 2022-08-31 13:06:15 -07:00