oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,950 Commits 1 Branch 0 Tags
80852c3e182ccdd4e1237b5e7770efa33ea9ec28
Commit Graph
13064 Commits
Author SHA1 Message Date
Marshall Bowers efb4ff816a Set tab bar and toolbar backgrounds 2023-12-07 22:32:41 -05:00
Joseph T. Lyons 1f51f74670 Add TODO 2023-12-07 22:24:32 -05:00
Marshall Bowers a88372dc99 Set background colors for title and status bars 2023-12-07 22:24:10 -05:00
Marshall Bowers f272881a6b theme_importer: Improve syntax token matching (#3549) 
This PR improves the approach we use to match syntax tokens between Zed
and VS Code in the `theme_importer`.

We now use the list of scopes assigned to each Zed syntax token to rank
the possible candidates in the VS Code and then pick the candidate with
the highest rank.

So far this has proved to provide better colors across the board, but
we'll continue to refine the matching over time.

Release Notes:

- N/A
 2023-12-07 22:11:31 -05:00
Mikayla 25df11dd26 Begin porting the PaneAxis element 2023-12-07 17:16:19 -08:00
Max Brunsfeld 808a0626c0 Show a notification on auto-update check action if updates are disabled 2023-12-07 16:49:27 -08:00
Marshall Bowers c7e19c0bcd Emit accurate hex colors in generated themes (#3547) 
This PR fixes an issues where the hex colors in the generated themes
were not correct.

We're using the [`palette`](https://crates.io/crates/palette) crate to
perform the conversions, as this gives us accurate hex codes that match
the VS Code source themes.

Release Notes:

- N/A
 2023-12-07 18:34:03 -05:00
Max Brunsfeld 58d8c51255 Show current user avatar when in a room w/o a shared project 2023-12-07 14:49:32 -08:00
Max Brunsfeld 5e3d0a6d03 Add following UI in collab titlebar (#3544) 
* [x] restructure titlebar to show facepiles for each collaborator and
their followers
* [x] allow following collaborators by clicking their avatars in the
titlebar
* [x] show grayscale avatar for collaborators not focused on this
project
* [x] show collaborators' microphone activity and muted status in the
titlebar
* [x] in facepile, show leader in front of followers
 2023-12-07 14:38:30 -08:00
Max Brunsfeld aa34637705 Add tooltip for following collaborators in titlebar 2023-12-07 14:31:21 -08:00
Max Brunsfeld 901bd6ac87 Order face pile front to back, left to right 2023-12-07 14:22:36 -08:00
Julia 445f0da4d8 zed2: Port ProjectSharedNotification (#3545) 
Release Notes:

- N/A
 2023-12-07 17:21:24 -05:00
Max Brunsfeld d1b47b4059 Indicate collaborators' presence (grayscale), speaking and muted status 2023-12-07 14:18:34 -08:00
Julia f3cbce7e86 zed2: Port ProjectSharedNotification 2023-12-07 17:13:22 -05:00
Max Brunsfeld 04d019ef66 Remove comments 2023-12-07 13:17:22 -08:00
Max Brunsfeld 282e4398a0 In titlebar, render followers and allow following people 2023-12-07 13:09:18 -08:00
Marshall Bowers fa223e0c6f Pull editor inlay hints from VS Code themes 2023-12-07 15:36:13 -05:00
Marshall Bowers 6a164db700 Rename members in ZedSyntaxToken 2023-12-07 14:35:58 -05:00
Marshall Bowers 8ed04fe798 Remove commented-out code in theme importer 2023-12-07 14:33:37 -05:00
Marshall Bowers 853daf953b Remove padding from ButtonSize::None (#3541) 
This PR removes the padding from buttons when using `ButtonSize::None`.

This fixes the size of the tab close buttons.

Release Notes:

- N/A
 2023-12-07 14:11:30 -05:00
Joseph T. Lyons 8b9b19195d Fix bug with how characters limits are being displayed 2023-12-07 13:19:03 -05:00
Joseph T. Lyons 5c3b8a1af1 Merge branch 'feedback-modal-ui' of https://github.com/zed-industries/zed into feedback-modal-ui 2023-12-07 13:00:59 -05:00
Joseph T. Lyons 0ee4ad6ba0 Skip using map 2023-12-07 13:00:49 -05:00
Nate Butler ef4bc5e20b Remove static status bar icons 2023-12-07 12:59:51 -05:00
Joseph T. Lyons 439df24526 Merge branch 'main' into feedback-modal-ui 2023-12-07 12:58:53 -05:00
Joseph T. LyonsandMarshall Bowers 7c19650a40 Remove when_else 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-07 12:37:07 -05:00
Marshall Bowers 393be3cedf Extract Tab component (#3539) 
This PR extracts a new `Tab` component from the tabs implementation in
the workspace.

This will allow us to reuse this component anywhere that we need to use
tabs.

Like our other newer components, the `Tab` component has a relatively
open API.

It accepts `children` (or `child`) as well as a `start_slot` and
`end_slot` to position content in the slots on either end of the
content. These slots also respect the `TabCloseSide` and will switch
positions based on this value.

<img width="763" alt="Screenshot 2023-12-07 at 12 19 42 PM"
src="https://github.com/zed-industries/zed/assets/1486634/78e4db6a-f807-431e-8777-f52f2631e6ed">

Release Notes:

- N/A
 2023-12-07 12:30:43 -05:00
Antonio Scandurra c91207b450 Don't panic when trying to reuse an existing workspace (#3538) 
Release Notes:

- N/A
 2023-12-07 18:23:33 +01:00
Antonio Scandurra 7ad6d489a4 Fix clipping when rendering paths (#3537) 
Release Notes:

- N/A
 2023-12-07 18:23:19 +01:00
Joseph T. Lyons 794b795800 Add TODO 2023-12-07 12:04:04 -05:00
Piotr Osiewicz 1bf94f0251 Do not render multibuffer without matches 2023-12-07 17:55:03 +01:00
Antonio ScandurraandNathan 2461902086 Don't panic when trying to reuse an existing workspace 
Co-Authored-By: Nathan <nathan@zed.dev>
 2023-12-07 17:53:07 +01:00
Piotr Osiewicz e9c40963ab Render multibuffer 2023-12-07 17:48:53 +01:00
Antonio ScandurraandNathan 08c4e1abdc Fix clipping when rendering paths 
Co-Authored-By: Nathan <nathan@zed.dev>
 2023-12-07 17:48:00 +01:00
Nate Butler 5e5eb25aab WIP 
[no-ci]
 2023-12-07 10:50:07 -05:00
Piotr Osiewicz ed5c05b272 Searches work, but the results are not displayed 2023-12-07 16:43:34 +01:00
Piotr Osiewicz b04838c23a WIP, search bar looks kinda okay 2023-12-07 16:26:40 +01:00
Kirill Bulatov b9a904e552 Add initial OS file drag and drop support 2023-12-07 16:08:48 +02:00
Kirill Bulatov 6c653b9c05 Activate Zed window on external file drop 2023-12-07 16:08:47 +02:00
Kirill Bulatov b692b4c9c2 Do not expand terminal selections on active drag 2023-12-07 16:08:47 +02:00
Kirill Bulatov f829120f51 Convert OS file drag and drop enter event into a mouse move, not mouse click 2023-12-07 16:08:47 +02:00
Kirill Bulatov 2a82dff2fe Suppress unused variable r-a warning from action derive procmacro 2023-12-07 16:08:47 +02:00
Kirill Bulatov 646b74e0a7 Move actions to namespaces used in zed1 keybinding settings 2023-12-07 16:08:47 +02:00
Kirill Bulatov 75324abbb5 Do not panic when focusing empty dock 2023-12-07 16:08:47 +02:00
Piotr Osiewicz 0c23e6738b Barebones project search (no UI, but the crate compiles) 2023-12-07 14:36:45 +01:00
Piotr Osiewicz ea708c50f0 Search2 fixups (#3533) 
Fixes several issues with focus and unbound actions.
Release Notes:

- N/A
 2023-12-07 14:01:21 +01:00
Piotr Osiewicz 8839bfa1df Remove unused import 2023-12-07 13:54:51 +01:00
Piotr Osiewicz 18393d1fac fixup! buffer search: Fix up rough edges 2023-12-07 13:13:38 +01:00
Antonio Scandurra 7842fdeb32 Fix confirming rename not working on editor2 2023-12-07 12:54:28 +01:00
Piotr Osiewicz 45f7ab876f buffer search: Fix up rough edges 
Focus query editor when Deploy::focused is true, add missing bindings
 2023-12-07 12:52:34 +01:00