oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,752 Commits 1 Branch 0 Tags
bbbdb9ff3e6cc90cf35c823e255cd694aa135af8
Commit Graph
15752 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Conrad Irwin 859f2d2862 Get ChannelModal opening 2023-12-02 00:57:41 -07: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
Conrad Irwin 1da18ebe9a copilot_menu2 (though only tested offling, which is insufficient) 2023-12-01 23:43:02 -07:00
Conrad Irwin 6426997abb Prevent languages showing in wrong order first 2023-12-01 21:26:23 -07:00
Conrad Irwin 6a5b5f022d Language Selector 2 working! 2023-12-01 21:23:20 -07:00
Conrad Irwin 2de6758443 +language_selector2 2023-12-01 21:23:20 -07:00
Mikayla fe83919746 Get terminal turning on 2023-12-01 17:01:57 -08:00
Mikayla 6730ff3624 Merge branch 'main' into terminal-element 2023-12-01 16:21:38 -08:00
MikaylaandMax b0f9144167 Compiling layout! 
co-authored-by: Max <max@zed.dev>
 2023-12-01 16:21:12 -08:00
Nathan SoboandMax 0edd89a92f Bind CloseWindow and Open actions on workspace 
Co-Authored-By: Max <max@zed.dev>
 2023-12-01 16:17:48 -07:00
Nathan Sobo 6f7995c150 Enable workspace::Open global action 2023-12-01 16:08:57 -07:00
Nathan SoboandMax 379ba620b2 Move workspace bindings to workspace context 
Without this, hitting cmd-n on the context menu in the project browser
invokes the workspace::NewFile action instead of the project::NewFile
action. We're considering changing the behavior so that bindings with no
context can only invoke global actions.

Co-Authored-By: Max <max@zed.dev>
 2023-12-01 15:59:40 -07:00
Nate ButlerandMarshall Bowers 2bf48872b6 Progress on diagnostic multibuffer 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-01 16:53:09 -05:00
Nate ButlerandMarshall Bowers 03ebf0a5a9 Implement FixedWidth for all button types 
[no-ci]

Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-01 16:20:39 -05:00
Max Brunsfeld 26ae31b503 Bump RPC protocol version in zed2 to match zed1 (#3482) 2023-12-01 13:14:49 -08:00
Max Brunsfeld 6b0457c52f Bump RPC protocol version in zed2 to match zed1 2023-12-01 13:08:45 -08:00
Piotr Osiewicz d81fb3680e Uncomment copilot2 tests 2023-12-01 22:04:43 +01:00
Max Brunsfeld d788bf3f1e Fix retrieval of app version in auto_update2 (#3481) 
With this fix, auto-updates should work on nightly.
 2023-12-01 12:59:02 -08:00
Nate ButlerandMarshall Bowers c07455efa7 Update path header style 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-01 15:53:17 -05:00
Max Brunsfeld d85db44552 Fix retrieval of app version in auto_update2 2023-12-01 12:52:26 -08:00
Nate Butler 89aa6a3726 Re-add diagnostic headers 2023-12-01 15:30:01 -05:00
Nate Butler f5679f98d6 Update diagnostics style 2023-12-01 14:52:17 -05:00
Piotr Osiewicz be509a5ce0 test_clipboard 2023-12-01 20:50:30 +01:00
Max Brunsfeld 5dd9db3607 collab 0.29.1 2023-12-01 11:50:05 -08:00
Max Brunsfeld aace0d816d Prevent moving a channel into its descendant (#3480) 
This fixes a bug where it was possible to put the channel tree into a
bad state by accidentally dragging a channel into itself or one of its
descendants.
 2023-12-01 11:47:39 -08:00
Max Brunsfeld 4479628342 Prevent moving a channel into its descendant 2023-12-01 11:41:38 -08:00
Piotr Osiewicz 0a1765b01f test_following_with_multiple_excerpts (passes) 2023-12-01 20:32:12 +01:00
Marshall Bowers c3e7732eab Add support for optional icon to Button (#3479) 
This PR extends `Button` with support for an optional icon to be
displayed next to the label.

As part of this, the functionality for displaying an icon within a
button has been factored out into an internal `ButtonIcon` component.
`ButtonIcon` is now used by both `IconButton` and `Button` to
encapsulate the concerns of an icon that is rendered within a button.

Release Notes:

- N/A
 2023-12-01 14:30:38 -05:00
Piotr Osiewicz a985b7aab4 test_following (passes :)) 2023-12-01 20:25:47 +01:00
Piotr Osiewicz 20ae58eddd Bunch of new tests 2023-12-01 20:23:34 +01:00
Piotr Osiewicz 9408eecb6e test_navigation_history (pass) 2023-12-01 20:17:41 +01:00
Piotr Osiewicz 2ab84b81da test_edit_events 2023-12-01 20:16:40 +01:00
Piotr Osiewicz e821e1fc35 Display map tests (3 flaky tests for chunks) 2023-12-01 20:14:14 +01:00
Piotr Osiewicz 237efc841e Another batch of tests 2023-12-01 19:39:53 +01:00
Marshall Bowers 4b23c5c658 Add selected_label to Button (#3478) 
This PR adds a new `selected_label` method to `Button`.

This can be used to set a different label that should be rendered when
the `Button` is selected.

Release Notes:

- N/A
 2023-12-01 13:29:11 -05:00
Piotr Osiewicz 1c52b936bc Uncomment flaky tests 2023-12-01 19:21:30 +01:00
Marshall Bowers 4f507756d6 Add selected_icon to IconButton (#3477) 
This PR adds a new `selected_icon` method to `IconButton`.

This can be used to set a different icon that should be rendered when
the `IconButton` is selected.

Release Notes:

- N/A
 2023-12-01 13:17:32 -05:00
Marshall Bowers 12b58f5b60 Add selected_icon to IconButton 2023-12-01 13:10:53 -05:00
Marshall Bowers f09d9ef723 Clean up some ButtonLike doc comments 2023-12-01 13:09:35 -05:00
Julia be5eb3e3b5 Zed2 breadcrumbs & tab bar context menus & pane focus events (#3475) 
See title

Release Notes:

- N/A
 2023-12-01 12:53:15 -05:00
Piotr Osiewicz 53f3f960d2 Another batch of tests 2023-12-01 18:43:44 +01:00
Julia 6f9e08ceea Merge branch 'main' into zed2-breadcrumbs 2023-12-01 12:28:36 -05:00
Nate Butler 85d72f63c1 Add Tinted button style placeholder and document ButtonLike (#3476) 
- Adds a placeholder `ButtonStyle::Tinted`.
  - Note: Using this now will just give you a block of `gpui::red()`
- Documents ButtonLike and ButtonStyle to hopefully help make choosing a
button style easier.

Release Notes:

- N/A
 2023-12-01 12:18:35 -05:00
Piotr Osiewicz 4c4ec221af Uncomment a bunch of tests in the editor 2023-12-01 18:11:27 +01:00
Julia 910aeb4f56 I'm a dunce 2023-12-01 11:47:04 -05:00
Nate Butler 0d33f01fa4 Collab UI Refinement - Part 1 (#3460) 
[[PR Description]]

Still WIP, merging this to get menu changes in.

Release Notes:

- N/A
 2023-12-01 11:42:31 -05:00
Piotr OsiewiczandAntonio e0ccaa60ff editor tests: Reintroduce block_on_ticks. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-01 17:24:47 +01:00
Piotr Osiewicz a40a5fb212 Revert "editor tests: Reintroduce block_on_ticks." 
This reverts commit aed11ee8cb.
 2023-12-01 17:24:20 +01:00
Piotr OsiewiczandAntonio aed11ee8cb editor tests: Reintroduce block_on_ticks. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-01 17:22:12 +01:00
Julia 13f4cc563c Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05:00