oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,089 Commits 1 Branch 0 Tags
81098312efa3acba7d637d83cb7c765a08e88b36
Commit Graph
68 Commits
Author SHA1 Message Date
Antonio Scandurra cc0bc444b1 Merge remote-tracking branch 'origin/main' into surfaces 
# Conflicts:
#	crates/ui2/src/components/avatar.rs
 2023-11-30 10:48:20 +01:00
Conrad Irwin 4fbbb28da2 Restore logical offset preservation behaviour 2023-11-29 23:51:31 -07:00
Conrad Irwin 54cfcef0aa Keybaord shortcut context menu 2023-11-29 23:04:33 -07:00
Conrad Irwin a37f86f294 Scroll the collab panel when keyboard focusing 2023-11-29 22:39:15 -07:00
Conrad Irwin 8638fc4149 Add a ScrollHandle to gpui2 for the collab panel 2023-11-29 22:20:06 -07:00
Conrad Irwin 012543052b Add filtering support 2023-11-29 20:58:15 -07:00
Conrad Irwin 4c27f4453c Merge branch 'main' into collab-panel2 2023-11-29 16:32:25 -07:00
Marshall Bowers b357ae4dc3 Add new Button and IconButton components (#3448) 
This PR adds new `Button` and `IconButton` components built on top of
our new button abstractions.

Both of these buttons are built from the common `ButtonLike` base, and
implement the `ButtonCommon` (name TBD) trait in order to provide a
common interface.

There are still some visual tweaks that we'll need to make to the new
buttons, but those should be straightforward to make after we land this.

Release Notes:

- N/A
 2023-11-29 17:41:44 -05:00
Conrad Irwin cd60d466b1 Merge branch 'main' into collab-panel2 2023-11-29 15:40:16 -07:00
Conrad Irwin 0eef4d03ed Scrollyscrolly 2023-11-29 15:30:50 -07:00
Conrad Irwin 4f040208c6 Fix mouse interaction on contact subsections 2023-11-29 15:26:19 -07:00
Conrad Irwin 3bdd51cb2a Availability indicators 2023-11-29 15:06:58 -07:00
Marshall Bowers df5de47a78 Make toggle method accept impl Into<Option<bool>> (#3446) 
This PR makes the `toggle` method on the various list components accept
an `impl Into<Option<bool>>` instead of just an `Option<bool>`.

This allows a caller with just a `bool` avoid having to wrap the
`Option` themselves.

Release Notes:

- N/A
 2023-11-29 16:13:41 -05:00
Conrad Irwin 6ab3825ab1 No moar toggleable 2023-11-29 13:25:29 -07:00
Conrad Irwin 87cf0cf5ac Merge branch 'main' into collab-panel2 2023-11-29 13:09:57 -07:00
Conrad IrwinandMax 7e5aa5ce77 More drag'n'drop fixes 
Co-Authored-By: Max <max@zed.dev>
 2023-11-29 12:35:25 -07:00
Marshall Bowers e77846d2dc Rework Toggle into Toggleable and ToggleState 2023-11-29 14:33:52 -05:00
Conrad IrwinandMax e377bd805b Add channel drag'n'drop 
Co-Authored-By: Max <max@zed.dev>
 2023-11-29 12:24:04 -07:00
Conrad Irwin 41e7653906 Channel Context Menu 2023-11-29 11:39:26 -07:00
Conrad Irwin ee260a5e24 Progress 2023-11-29 11:06:24 -07:00
Max Brunsfeld dbfc7d3555 Merge branch 'main' into project-panel-context-menu 2023-11-29 09:45:31 -08:00
Max BrunsfeldandConrad 233aac5573 Make DismissEvent a unit struct 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-29 09:42:54 -08:00
Nate ButlerandMarshall Bowers a8bf0834e6 Button2 – Part1 (#3420) 
## TODO

- [x] Remove `InteractionState`
- [ ] `Selectable` should use `Selection` instead of a boolean
- [x] Clean out ui2 prelude
- [ ] Build out button2 button types
- [ ] Port old buttons

Release Notes:

- N/A

---------

Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-29 12:23:09 -05:00
Conrad Irwin 5fbc60d8da Inviting/Responding/Creating Channels... etc. 2023-11-28 22:47:04 -07:00
Conrad Irwin 60ce75c34a Togglable channels, the greatest since sliced bread 2023-11-28 16:52:12 -07:00
Conrad Irwin 4c2348eb53 Fix tests, notify errors 2023-11-28 16:20:54 -07:00
Conrad Irwin af3fa4ec0b Basic channel joining! 2023-11-28 16:10:18 -07:00
Conrad Irwin b13638fa76 Remove debugging 2023-11-28 15:33:44 -07:00
Conrad Irwin a85e0db1f4 More progress on collab panel 2023-11-28 14:40:32 -07:00
Conrad Irwin 01d3432a40 Merge branch 'main' into collab-panel2 2023-11-28 11:40:58 -07:00
Piotr Osiewicz 6c37393dd1 Add contact finder, change ui::List's on_click handler signature 2023-11-28 14:16:51 +01:00
Conrad Irwin 26121713b3 Show channels and users in the sidebar 2023-11-27 19:57:55 -07:00
Conrad Irwin 4a25fae51e TEMP 2023-11-27 16:22:01 -07:00
Conrad Irwin 6f839a1b48 Add logged out collab panel 2023-11-27 13:00:12 -07:00
Conrad Irwin 4f885252ab [Zed2] Collab UI (#3403) 
Release Notes:

- N/A
 2023-11-27 12:40:59 -07:00
Piotr OsiewiczandConrad 1c2f906e48 Position incoming call notification on right hand side. 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-27 19:37:04 +01:00
Piotr OsiewiczandConrad b2b5df4428 close notification handler proper on accept/decline 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-27 18:57:25 +01:00
Piotr Osiewicz 8ca9f4e12a Fix some more warnings 2023-11-27 15:49:47 +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 714b45157b Replace unrendered frame with a frame counter 
Move facepile to the left hand side
 2023-11-27 13:02:21 +01:00
Piotr Osiewicz 9590f253a9 Fix warnings 2023-11-27 12:46:07 +01:00
Piotr Osiewicz 5cbe8deb50 Fix up tests 2023-11-27 12:33:44 +01: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
Nate Butler 7e61d340ce Outline some unfinished elements 2023-11-24 08:58:49 -05:00
Piotr Osiewicz f2b62c3946 Start emitting notifications for calls 2023-11-24 00:52:44 +01:00
Piotr Osiewicz e754c6626d Allow calling an user, render contacts in collab panel 2023-11-23 16:19:25 +01:00
Piotr Osiewicz b463454062 Remove redundant comment 2023-11-23 15:03:54 +01:00