oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,981 Commits 1 Branch 0 Tags
a41c857855ada9f1013d00e83db9f35d3df2cc53
Commit Graph
158 Commits
Author SHA1 Message Date
Mikayla a41c857855 Merge branch 'main' into welcome2 2023-11-28 15:38:51 -08:00
Mikayla d927c2f497 Implement all but the UI 2023-11-28 15:18:19 -08:00
Conrad Irwin a761e6ca0e More mouse occlusion work 2023-11-28 09:59:58 -07:00
Conrad Irwin 107c3d7f67 Fix esc in command palette 
Also: add editor.register_action
 2023-11-27 14:32:22 -07:00
Conrad Irwin 4f885252ab [Zed2] Collab UI (#3403) 
Release Notes:

- N/A
 2023-11-27 12:40:59 -07:00
Piotr Osiewicz 30af3ffaf3 fixup! Use AppContext instead of AsyncWindowContext to quit 2023-11-27 15:47:00 +01:00
Piotr Osiewicz 44876062c9 Use AppContext instead of AsyncWindowContext to quit 
Fixes refcell-related panic
 2023-11-27 15:44:19 +01:00
Piotr Osiewicz a71180257d Add deafening support 2023-11-27 15:12:13 +01:00
Piotr Osiewicz bf4211b03a Use facepile for avatars 2023-11-27 14:56:51 +01:00
Piotr Osiewicz 4c1514edc4 fixup! Remove shared_screen from workspace 2023-11-27 12:10:07 +01:00
Conrad Irwin 039c933d8e gpui2: Notifications 2023-11-26 22:28:53 -07:00
Piotr Osiewicz 481c19fbaf WIP, frames are being sent to the other end 2023-11-24 17:31:47 +01:00
Piotr Osiewicz 6ebe5d5053 Add mute handling 2023-11-24 15:16:03 +01:00
Piotr Osiewicz e754c6626d Allow calling an user, render contacts in collab panel 2023-11-23 16:19:25 +01:00
Piotr Osiewicz c191943849 Add basic call/user UI in top-right corner. 
Allow ui::Avatar to take custom data instead of always relying on URI resolution
 2023-11-23 15:00:13 +01:00
Piotr Osiewicz fa74c49dbb Add dummy call handler for tests 2023-11-22 19:23:58 +01:00
Piotr Osiewicz 7e7a778d11 Move CallFactory into AppState 
Fix crash caused by double borrow of window handle
 2023-11-21 22:04:02 +01:00
Piotr Osiewicz abe5a9c85f Finish up decoupling workspace from call 2023-11-21 20:51:53 +01:00
Piotr Osiewicz ebccdb64bc Move CallHandler impl into call2 2023-11-21 20:18:35 +01:00
Piotr Osiewicz 170291ff96 Start decoupling workspace and call crates 2023-11-21 19:57:24 +01:00
MikaylaconradNathan
 		2c4d83c9af WIP 
co-authored-by: conrad <conrad@zed.dev>
co-authored-by: Nathan <nathan@zed.dev>
 2023-11-20 14:46:01 -08:00
Conrad Irwin 0798cfd58c Merge branch 'main' into derive-element-redux 2023-11-20 09:15:38 -07:00
Nathan Sobo 0673606de8 WIP 2023-11-18 20:22:43 -07:00
Nathan Sobo adc355a1e6 Element refinement passing on ui2 2023-11-18 20:05:47 -07:00
Mikayla 55dbcf2039 Remove unused imports 2023-11-17 23:14:14 -08:00
Nate Butler f9804feefa Remove flex_1 from bottom dock to fix pane group spacing 2023-11-18 02:06:51 -05:00
Julia 189ddf9380 Merge branch 'main' into unborked-git-zed2-diagnostics-view 2023-11-17 16:43:29 -05:00
Julia 3655a96e54 Merge branch 'main' into unborked-git-zed2-diagnostics-view 2023-11-17 16:32:35 -05:00
Julia a464a7da2a Merge branch 'main' into unborked-git-zed2-diagnostics-view 2023-11-17 16:32:35 -05:00
JuliaandNathan Sobo f4eb219c75 Get diagnostics view almost building in the zed2 world 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-17 16:32:35 -05:00
Conrad Irwin 624bd0a05a Collab ui2 (#3357) 
* Clickable context menus & movable panels – what will they think of
next?!

Release Notes:

- N/A
 2023-11-17 13:33:18 -07:00
Conrad Irwin ceb20dea96 Refactorings 2023-11-17 13:23:12 -07:00
Mikayla 1693718637 Merge branch 'main' into saving-2 2023-11-16 23:11:38 -08:00
Mikayla 9a3cd073c7 Restore a bunch of random workspace stuff 2023-11-16 23:05:28 -08:00
Conrad Irwin 2d1d75f482 +ManagedView 
And some games with rust traits
 2023-11-16 23:02:10 -07:00
Conrad Irwin 6d4276ea5f Merge branch 'main' into collab_ui2 2023-11-16 22:08:42 -07:00
Mikayla Maki 61bd6bab09 Actions‽ (#3349) 
This PR re-implements our actions with macros instead of a blanket impl.

Release Notes:

- N/A
 2023-11-16 18:18:04 -08:00
Mikayla 4de2c0f7ef Re-implement actions as derive macros instead of blanket impls 2023-11-16 17:32:02 -08:00
Nate Butler a526f23c81 Add ui_font settings and set default rem size accordingly (#3346) 
[[PR Description]]
- Adds ui_font_family, ui_font_features, ui_font_size to settings and
default settings
- Use the new ui font settings to set the rem size when the workspace is
created.

Release Notes:

- N/A
 2023-11-16 15:40:33 -05:00
Nate ButlerandMikayla Maki fa9f4a9355 Init rem_size in the workspace at the start of the render 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-11-16 13:43:36 -05:00
Marshall Bowers b559bfd80f Parameterize theme2::init to allow loading just the base theme (#3345) 
This PR adds a parameter to the `theme2::init` method to indicate what
the theme-loading behavior should be.

This allows us to indicate when we want to load all of the additional
built-in user themes (like in the Zed binary and in the storybook), and
when we don't want to load the user themes (like in tests).

We're using an enum over just a `bool` here for clarity at the call
site.

Release Notes:

- N/A
 2023-11-16 13:03:30 -05:00
Conrad Irwin 4540f04dbe Add more detail to panel switcher interaction 2023-11-16 09:57:59 -07:00
Kirill Bulatov fd61683c46 WIP 2023-11-16 10:40:02 +02:00
Kirill Bulatov a238368296 More compilation fixes 2023-11-16 10:04:18 +02:00
Mikayla 9da0b78ead Merge branch 'main' into tabs-n-splits 2023-11-15 23:41:25 -08:00
Mikayla c70c0f9ae9 Remove initialize_workspace 2023-11-15 23:11:31 -08:00
Conrad Irwin 0a9fb3978b Enable panel switching 2023-11-15 21:01:00 -07:00
Mikayla 78cea69172 Add focusable view and restore workspace deserialization. Partially restore split and tab functions 2023-11-15 16:36:43 -08:00
Mikayla e905ababcd Add back splitting 2023-11-15 15:21:19 -08:00
Conrad Irwin 793fa6e3a4 Move placeholder titlebar render to collab_ui 2023-11-15 16:09:21 -07:00