oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,200 Commits 1 Branch 0 Tags
54e45306c59d33d44e045bbf44d9c42d9427a2df
Commit Graph
47 Commits
Author SHA1 Message Date
Marshall Bowers b9bc74abe5 Increase toolbar padding 2023-12-20 17:03:44 -05:00
Marshall Bowers 53b608378c Don't apply the gap when we don't have any items in the first row 2023-12-20 17:02:15 -05:00
Kirill BulatovandAntonio Scandurra fe40e3920b Fix remaining z-index bugs 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2023-12-20 18:23:09 +02:00
Kirill BulatovandAntonio Scandurra cf12d62fc5 Tidy up z-index handling 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2023-12-19 23:50:42 +02:00
Kirill BulatovAntonio ScandurraNathan Sobo
 		825a8f0927 Initial fix of the z-index 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-12-19 23:29:08 +02:00
Marshall Bowers 7bc9319871 Apply padding at the toolbar level (#3720) 
This PR adjusts the padding in the toolbar to be applied within the
toolbar itself.

Previously the different elements within the toolbar were applying their
own padding, which led to inconsistencies.

Release Notes:

- N/A
 2023-12-19 16:01:03 -05:00
Nate Butler a286ec4650 Update toolbar.rs 2023-12-18 16:10:13 -05:00
Nate Butler 9cd8e99a9a Update toolbar.rs 2023-12-18 14:10:12 -05:00
Nate Butler 2ae39b70c8 Add left side padding 2023-12-18 13:55:30 -05:00
Nate Butler c9893ce2fd Use flex_1 div instead of justify_center in toolbar 2023-12-18 13:51:04 -05:00
Marshall Bowers 2484a6969a Fix toolbar flex sizing 2023-12-14 15:57:06 -05:00
Marshall Bowers c6e44683e6 Hide the toolbar if it has no visible items (#3654) 
This PR makes the toolbar hide itself if it has no visible items.

This removes the double border beneath the tab bar when there are no
visible tools in the toolbar.

Release Notes:

- N/A
 2023-12-14 13:02:27 -05:00
Marshall Bowers 61ab1834c7 Deploy the buffer search in a second row in the toolbar (#3630) 
This PR updates the buffer search to deploy to a second row in the
toolbar, instead of trying to deploy into the initial row.

This is the same way it works in Zed1.

Release Notes:

- N/A
 2023-12-13 13:06:53 -05:00
Nate ButlerandMarshall Bowers 27703a3279 Update tabs rendering, fix tab spacing bug 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-05 14:04:12 -05:00
Nate Butler eed5a698cf Update tab close button 2023-12-05 11:59:23 -05:00
Nate Butler 7c5df51d2e Update button sizes 2023-12-05 10:11:18 -05:00
Nate Butler af72772a72 Expand toolbar tools 2023-12-05 09:02:21 -05:00
Julia 910aeb4f56 I'm a dunce 2023-12-01 11:47:04 -05:00
Julia ce16e5b54a Unbreak toolbar layout & improve disabling ButtonLike 2023-12-01 10:33:44 -05:00
JuliaandConrad Irwin d516ae0d8a Pane context menus & focus shenanigans 
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
 2023-11-30 14:01:09 -05:00
Julia 428c517693 Merge branch 'main' into zed2-breadcrumbs 2023-11-30 11:38:29 -05:00
Julia 591299b4c7 Start getting pane focus code ported 2023-11-30 10:47:28 -05:00
Marshall Bowers bda1dc7721 Use ButtonLike for breadcrumb (#3452) 
This PR updates the (placeholder) breadcrumb to use the new `ButtonLike`
component.

Eventually this will need custom styling (e.g., syntax highlighting for
the symbol children), which is why we're using a `ButtonLike` as opposed
to a regular `Button`.

Release Notes:

- N/A
 2023-11-29 19:21:34 -05: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
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
Nate Butler 7e61d340ce Outline some unfinished elements 2023-11-24 08:58:49 -05:00
Nate Butler bec61123fd Update toolbar.rs 2023-11-21 11:06:27 -05:00
Nate Butler 453aa5ffd7 TextColor -> Color 2023-11-21 01:05:29 -05:00
Piotr OsiewiczandMikayla 3e329861f9 Brave new world awaits 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-11-21 00:47:47 +01:00
Piotr Osiewicz 54a3b56935 Merge remote-tracking branch 'origin/callback-handles' into search2 2023-11-21 00:40:20 +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
Piotr Osiewicz d60855b06d Merge branch 'main' into search2 2023-11-20 19:23:35 +01:00
Nathan Sobo 0673606de8 WIP 2023-11-18 20:22:43 -07:00
Piotr Osiewicz b11bfa8821 Merge branch 'main' into search2 2023-11-15 12:54:26 +01:00
Piotr OsiewiczandNate c14efb74d7 Finish up touchups for search UI. 
Co-authored-by: Nate <nate@zed.dev>
 2023-11-14 18:18:52 +01:00
Piotr OsiewiczandNate 08dde94299 WIP styling 
Co-authored-by: Nate <nate@zed.dev>
 2023-11-14 17:59:53 +01:00
Piotr Osiewicz 6c69e40e5c WIP 2023-11-14 16:56:31 +01:00
Piotr Osiewicz dfd68d4cb8 WIP: start search2 2023-11-13 20:38:37 +01:00
Mikayla 2c67cc80ba Merge branch 'main' into event-emitter 2023-11-08 20:10:38 -08:00
Mikayla a97c8bf58f Get workspace compiling with new event emitters 2023-11-08 19:29:00 -08:00
Conrad Irwin 1b9f76c01d Refactor GoToLine to use cx.observe_new_views() 2023-11-08 16:23:05 -07:00
Kirill Bulatov eb8a0e7148 Uncomment persistence tests 2023-11-03 12:38:09 +02:00
Conrad Irwin 8283909dfd Disable selective warnings to make cargo check happy 2023-11-02 13:28:58 -06:00
KCaverly 551171a339 Merge branch 'zed2' of github.com:zed-industries/zed into zed2-workspace 2023-10-31 11:39:34 -04:00
Antonio Scandurra 14a6199b4b WIP: Make the item module compile again 2023-10-31 13:56:48 +01:00
Antonio Scandurra 89bcbe3eeb WIP 2023-10-30 16:43:01 +01:00
Antonio Scandurra c8b5b085f4 WIP 2023-10-26 12:27:20 +02:00