Commit Graph
813 Commits
Author SHA1 Message Date
Nate ButlerandMikayla Maki 201899d76d WIP Re-case internal and experiment theme folders
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2022-10-21 13:04:24 -04:00
Antonio Scandurra 231fc0f698 Merge branch 'main' into screen-sharing
# Conflicts:
#	crates/collab/src/integration_tests.rs
#	crates/collab/src/main.rs
#	styles/src/styleTree/workspace.ts
2022-10-21 14:29:45 +02:00
K Simmons a5f1eff761 flattened layers and elevations 2022-10-19 13:02:51 -07:00
Antonio Scandurra 65ddc77fa6 Add control to toggle screen-sharing 2022-10-19 10:19:20 +02:00
K Simmons 061a82a267 Merge branch 'main' into elevations 2022-10-18 12:47:15 -07: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
Nate ButlerandKay Simmons 47e15f7a35 Style elevations & update styleTrees
Also rename `info` -> `accent`

Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com>
2022-10-11 17:38:28 -04: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 e288ca28c8 Always show invite link in contacts popover 2022-10-11 18:22:00 +02:00
Antonio Scandurra 2d62f462e2 Show participant projects in contacts popover 2022-10-11 12:23:15 +02:00
Antonio Scandurra 7863cace56 Show project root names when displaying incoming call notification 2022-10-11 10:59:36 +02:00
Nathan Sobo 6dbc03924b Rename Join button to Open, rework message slightly 2022-10-10 18:12:00 -06:00
Nathan SoboandAntonio Scandurra 9b3d843f9d Show worktree root names when sharing additional projects on a call
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2022-10-10 17:56:03 -06:00
Max Brunsfeld eee0e6dd14 Add scrollbars to editors 2022-10-10 16:20:47 -07:00
Antonio Scandurra 794bea8dbd Merge remote-tracking branch 'origin/main' into room 2022-10-10 15:43:38 +02:00
Antonio Scandurra 66857a5225 Style project shared notifications 2022-10-10 14:37:51 +02:00
Antonio Scandurra bf258be248 Style incoming call notification 2022-10-10 11:36:39 +02:00
Antonio Scandurra 9b71155bc9 Add leave button on active call header 2022-10-10 10:30:51 +02:00
Antonio Scandurra 3d4c808b94 Move contact finder into contacts popover 2022-10-10 09:56:21 +02:00
Antonio Scandurra 03e46aaaf9 Show current user in active call 2022-10-08 14:38:17 +02:00
Antonio ScandurraandNathan Sobo cf72bc4a14 WIP: Render active call in contacts popover
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-10-07 17:01:48 +02:00
Antonio Scandurra 6393ad8c75 Show contact status 2022-10-07 13:56:28 +02:00
Antonio Scandurra a2c823e866 Move contacts panel styles into contacts popover 2022-10-06 14:07:21 +02:00
Antonio Scandurra f3b459ede5 Move contacts panel features into collab_ui 2022-10-06 14:00:14 +02:00
Antonio Scandurra bca261ef76 Set room location when active workspace changes 2022-10-05 15:03:40 +02:00
Antonio Scandurra cc8f7e188c Show notification when a new project is shared and allow joining it 2022-10-04 16:55:41 +02:00
Antonio Scandurra 1021f51bf8 Show Share button for unshared projects when inside of a room 2022-10-04 15:56:20 +02:00
Antonio Scandurra 66d211f378 Use a different style for inactive participants 2022-10-04 15:06:20 +02:00
Mikayla Maki da143ae46a made git diff rendering respect line wrap 2022-10-02 18:00:13 -07:00
Mikayla Maki 63747c8fee made git stuff slightly more themable 2022-09-29 13:16:02 -04:00
8f5a2a7a4f Pull git indicator colors out of theme
Co-Authored-By: Kay Simmons <kay@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Nathan SoboandAntonio Scandurra 8c854e51a8 Rename AddParticipantPopover to ContactsPopover
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2022-09-28 09:10:01 -06:00
Nathan SoboandAntonio Scandurra 444d92870d Remove contacts menu bar extra
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2022-09-28 09:06:28 -06:00
Antonio Scandurra 1af9f9eb3d Show add participant popover on click 2022-09-28 11:33:38 +02:00
Antonio Scandurra adf918d947 Introduce a + button in the titlebar 2022-09-28 11:33:38 +02:00
K Simmons 505f4d0cf7 promote variant to its own styleset 2022-09-22 13:29:19 -07:00
K Simmons d5c812e105 add theme testbench command 2022-09-21 16:32:44 -07:00
K Simmons 1b939d6238 reworked style tree to use colorScheme instead of old theme. Very limited style for now 2022-09-21 16:32:42 -07: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 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
Antonio Scandurra 9df4ac7e07 Style contacts popover background based on theme 2022-09-15 11:57:22 +02: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
K Simmons 4a35495d3c Extract panel resize code from sidebar into Resizable element
Make resizable work in vertical axis
Make dock resizable
Have dock preserve size based on Anchor position
Make pane buttons work more correctly in pathological cases
Sync status bar dock button with dock visibility/anchor position

Co-Authored-By Mikayla Maki <mikayla@zed.dev>
2022-09-12 18:32:15 -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 08be69255a Added experimental themes flag 2022-09-08 15:47:27 -07:00
Mikayla Maki c5344552c5 Finished internal themes 2022-09-08 15:06:08 -07:00
Mikayla Maki bcf28aeaf0 Sorted themes correctly 2022-09-08 14:11:48 -07:00