oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,467 Commits 1 Branch 0 Tags
1f51f74670c78134ae22c14476e10532cc58bafe
Commit Graph
185 Commits
Author SHA1 Message Date
Mikayla 22cd62213b Tear out drag event listener 2023-12-06 16:22:25 -08:00
Mikayla fd31e429f5 Merge branch 'main' into terminal-element 2023-12-06 15:20:04 -08:00
MikaylaandNathan 12e7f61f62 Fix a porting bugs for terminal2 
co-authored-by: Nathan <nathan@zed.dev>
 2023-12-06 15:11:49 -08:00
Nathan Sobo ac07e230fa Document geometry 2023-12-06 12:28:44 -07:00
Piotr OsiewiczandAntonio d09dfe01f5 Wire up global actions 
Added an ephemeral root node so that even if there's no window/focused handle we still have something to dispatch to.

Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-06 16:15:53 +01:00
Mikayla 735f2029e9 Add more debugging 2023-12-05 17:31:33 -08:00
Mikayla 2ee0ecb677 Add back the main structure 2023-12-05 16:52:29 -08:00
Mikayla ab140ee4c2 Add event based drag API to GPUI, continue binding mouse handlers to terminal 2023-12-05 12:07:17 -08:00
Max Brunsfeld 5e79807f6f Fix tree branch rendering in collab panel 2023-12-05 10:14:40 -08:00
Max Brunsfeld ae6ddceb67 Enable more collab UI features (#3496) 
* Current Call section of the collab panel
* Improve the collab titlebar
* Add basic UI for following

Following only partially works, but the UI for following is now in
place.
 2023-12-04 18:01:11 -08:00
Max BrunsfeldandNathan 63667ecf6f Start bringing back the current call section of the collab panel 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-04 15:46:56 -08:00
Conrad Irwin 13bb16577c action dispatch target (#3494) 
- Ensure the candidate keybinding matches the correct context
- Fix context key matching
- I was soooo close
- Dispatch actions on focused node

[[PR Description]]

Release Notes:

- (Added|Fixed|Improved) ...
([#<public_issue_number_if_exists>](https://github.com/zed-industries/community/issues/<public_issue_number_if_exists>)).
 2023-12-04 23:43:26 +00:00
Conrad Irwin c82fea375d Dispatch actions on focused node 
Allows us to implement context menu matching nicely
 2023-12-04 22:58:04 +00:00
Marshall Bowers c10d8a8110 Fix cursor styles not displaying properly (#3493) 
This PR fixes an issue where an element with a cursor style set would
not update the cursor when hovering over it.

Previously the cursor style would only appear by interacting with the
element in some way, for instance, by clicking on the element or by
having a `.hover` with some other style being applied.

Release Notes:

- N/A
 2023-12-04 16:40:53 -05:00
Conrad Irwin 63b65b2b2e Dismiss tooltips at capture 
(Otherwise they stay open when you hover over the editor, which
stops mouse move events propagating)
 2023-12-01 23:51:06 -07:00
Julia 13f4cc563c Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05:00
Julia 428c517693 Merge branch 'main' into zed2-breadcrumbs 2023-11-30 11:38:29 -05:00
Antonio ScandurraandNathan Sobo 5243401afa Pass a WindowContext in request_measured_layout 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-30 17:12:40 +01:00
Antonio Scandurra d9b8c07b1e Lift Send and Sync restriction for measurements 2023-11-30 16:37:57 +01:00
Antonio Scandurra fac029b808 Fix errors in theme2 2023-11-30 12:08:00 +01:00
Antonio Scandurra 624ea58f2e Polish screen sharing 2023-11-30 11:22:01 +01:00
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 02174084ca Collab panel2: Now with scrolling and keyboard (#3455) 
Also introducing: .track_scroll() for non-uniform lists.

Release Notes:

- N/A
 2023-11-30 00:13:52 -07: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
Max Brunsfeld c95a7c7387 Address some TODOs in editor2 crate (#3445) 
* Fix crash when jumping to definition
* Enabling resolution of completions
* Make links in interactive text clickable
* Enable code paths that use `select_anchors`
 2023-11-29 16:32:02 -08:00
Max Brunsfeld 2bd428102b Use pointer cursor style for clickable ranges in InteractiveText 2023-11-29 12:42:09 -08:00
Conrad IrwinandMax 7e5aa5ce77 More drag'n'drop fixes 
Co-Authored-By: Max <max@zed.dev>
 2023-11-29 12:35:25 -07:00
Antonio Scandurra a4035f15af WIP 2023-11-29 18:18:15 +01:00
Conrad Irwin 35481e2c79 Move padding on uniform list inside the scrollable area 2023-11-29 10:05:31 -07:00
Conrad Irwin a761e6ca0e More mouse occlusion work 2023-11-28 09:59:58 -07:00
Antonio Scandurra 3ac545088a WIP: preserve aspect ratio of images 2023-11-28 17:33:11 +01:00
Antonio ScandurraandJulia 600b564bbf Introduce surface rendering 
Co-Authored-By: Julia <julia@zed.dev>
 2023-11-28 16:47:31 +01:00
Conrad Irwin ca0dcf741f Use layers to correct mouse event handling too 2023-11-28 00:07:26 -07:00
Conrad Irwin 17b5f9294c Fix hover state when element is occluded 2023-11-27 23:18:25 -07:00
Nate Butler ca2052b0c1 Merge branch 'main' into completions-styles 2023-11-27 19:22:07 -05:00
JuliaandMax Brunsfeld d551b41aae zed2: Mostly port breadcrumbs & improve StyledText api 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-11-27 16:09:31 -05:00
Marshall Bowers 24f3034106 Add ListItem story (#3411) 
This PR adds a story for the `ListItem` component, so we can work on it
in isolation.

Release Notes:

- N/A
 2023-11-27 15:24:41 -05:00
Conrad Irwin 4f885252ab [Zed2] Collab UI (#3403) 
Release Notes:

- N/A
 2023-11-27 12:40:59 -07:00
Marshall Bowers feb7753a73 Fix typo in uniform_list's doc comment 2023-11-27 14:20:27 -05:00
Conrad Irwin 212d9254e1 Merge branch 'main' into completions-styles 2023-11-27 11:49:39 -07:00
Conrad Irwin 7a8aba329b Break content mask for hoverables 2023-11-27 11:43:14 -07:00
Nate Butler 8a35a02863 Checkpoint - try using overlay for completions popover 
[no ci]
 2023-11-27 11:22:19 -05:00
Antonio Scandurra 682712f132 Account for previous line lengths when returning index 2023-11-24 18:32:48 +01:00
Antonio Scandurra 56d043f671 Allow finding which ranges were clicked on an InteractiveText 2023-11-23 18:08:49 +01:00
Piotr Osiewicz 390ecb5b0c Merge branch 'main' into collab_ui-zed2 2023-11-23 15:02:55 +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
Antonio Scandurra 3b918bfee8 Merge branch 'main' into rename-element-traits 
# Conflicts:
#	crates/gpui2/src/elements/uniform_list.rs
#	crates/ui2/src/components/context_menu.rs
#	crates/ui2/src/components/list.rs
 2023-11-23 12:47:46 +01:00