Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
17040 commits 1103 branches 1111 tags 398 MiB
Commit graph

146 commits

Author SHA1 Message Date
Marshall Bowers
90f4c70a82
Rename h_stack and v_stack to h_flex and v_flex, respectively (#4053) 
This PR renames the `h_stack` and `v_stack` to `h_flex` and `v_flex`,
respectively.

We were previously using `h_stack` and `v_stack` to match SwiftUI, but
`h_flex` and `v_flex` fit better with the web/flexbox terminology that
the rest of GPUI uses.

Additionally, we were already calling the utility functions used to
implement `h_stack` and `v_stack` by the new names.

Release Notes:

- N/A
 2024-01-15 11:34:06 -05:00
Antonio Scandurra
4ff514ca7e Merge remote-tracking branch 'origin/main' into cache 
# Conflicts:
#	crates/gpui/src/elements/div.rs
 2024-01-15 11:37:46 +01:00
Conrad Irwin
b34c78016f Fix tests for TestPanel 2024-01-14 12:26:54 -07:00
Conrad Irwin
898645681f Move settings subscription to dock 
Reduces likelihood of panels being unable to move themselves
 2024-01-13 22:41:26 -07:00
Antonio Scandurra
1c260e6dfd Merge remote-tracking branch 'origin/main' into cache 
# Conflicts:
#	crates/copilot/src/sign_in.rs
#	crates/gpui/src/window.rs
#	crates/workspace/src/pane_group.rs
 2024-01-10 22:58:52 +01:00
Mikayla
9ce7ef8949
Remove the last of the major todos 2024-01-09 16:14:54 -08:00
Marshall Bowers
fa53353c57
Rename IconElement to just Icon (#3974) 
This PR renames the `IconElement` component to just `Icon`.

This better matches the rest of our components, as `IconElement` was the
only one using this naming convention.

The `Icon` enum has been renamed to `IconName` to free up the name.

I was trying to come up with a way that would allow rendering an
`Icon::Zed` directly (and thus make the `IconElement` a hidden part of
the API), but I couldn't come up with a way to do this cleanly.

Release Notes:

- N/A
 2024-01-09 10:11:20 -05:00
Kirill Bulatov
625c9d8980 Remove some todo!'s 2024-01-09 11:36:36 +02:00
Antonio Scandurra
84c36066bc Start on caching views 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2024-01-08 19:07:20 +01:00
Conrad Irwin
204ef451d0 Merge branch 'main' into following-tests 2024-01-05 16:14:12 -07:00
Conrad Irwin
81d707adbc Port 1.00 following tests 
Co-Authored-By: Max <max@zed.dev>
 2024-01-05 15:55:33 -07:00
Conrad Irwin
fa73cf3983 Correct dock menu names 2024-01-05 09:58:07 -07:00
Max Brunsfeld
789ce8dd75 Remove 2 suffix for workspace 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2024-01-03 11:08:51 -08:00
Max Brunsfeld
ed7bc91dbd Create chat panel settings 2023-09-08 13:28:19 -07:00
Mikayla
2f16147055
Fix dock resizing 2023-08-16 19:47:54 -07:00
Mikayla
111e17b220
Merge branch 'main' into collab-panel 2023-08-15 03:25:45 -07:00
Mikayla
e5eed29c72
Add components example 
Re-arrange generics on mouse event handler
Add TypeTag struct for dynamically tagged components
 2023-08-15 03:06:43 -07:00
Mikayla
99daa73325
Merge branch 'main' into collab-panel 2023-08-09 10:37:22 -07:00
Nathan Sobo
b2d9ccc0a2 Move more window methods off AsyncAppContext 2023-08-08 11:38:07 -06:00
Nathan Sobo
d896d89842 Store an AnyWindowHandle in WindowContext 2023-08-08 11:08:37 -06:00
Mikayla
8980a9f1c1
Add settings for removing the assistant and collaboration panel buttons 
Add a not-logged-in state to the collaboration panel

co-authored-by: max <max@zed.dev>
 2023-08-07 16:27:47 -07:00
Max Brunsfeld
c537cf2a57 Merge branch 'main' into collab-panel 2023-08-07 11:50:40 -07:00
Mikayla Maki
ac35dae66e
Add channels panel with stubbed out information 
co-authored-by: nate <nate@zed.dev>
 2023-07-28 13:21:39 -07:00
Antonio Scandurra
6f0efec146 Merge remote-tracking branch 'origin/main' into save-conversations 2023-06-23 09:09:42 +02:00
Nathan Sobo
23bc11f8b3 Remove the nested Pane from the assistant 
Since we don't want tabs, I think it would be better to render the toolbar
for ourselves directly and handle switching between conversations.

Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-06-20 18:52:48 -06:00
Mikayla Maki
dacfd70fb4
Remove unescessary enum 2023-06-20 16:05:23 -07:00
Piotr Osiewicz
0256f89dd6
Rename on/off states to active/inactive 2023-06-20 16:05:23 -07:00
Piotr Osiewicz
e92015b12f
Split out Interactive<T> into Toggle<T> and Interactive<T> 2023-06-20 16:05:20 -07:00
Antonio Scandurra
f068712a0a Activate screen-sharing when leader activates a panel 2023-06-15 18:01:30 +02:00
Antonio Scandurra
20e65a533c Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-02 09:32:11 +02:00
Max Brunsfeld
ac41564a8f Dismiss zoomed panels by closing their dock, not zooming them out 2023-05-31 12:45:55 -07:00
Max Brunsfeld
76927b6d95 Make active panel's button close its dock 2023-05-31 10:29:59 -07:00
Mikayla Maki
0122cd61c5
fmt 2023-05-30 16:33:42 -07:00
Mikayla Maki
5e4a9abd09
Fix bug in panel button dispatch 2023-05-30 15:17:42 -07:00
Mikayla Maki
9c9af5ed94
Remove focus side effects from toggle dock commands 
co-authored-by: max <max@zed.dev>
 2023-05-30 12:32:00 -07:00
Mikayla Maki
84f98f13c4
Seperate open and zoom bits conceptually for new panels 
co-authored-by: max <max@zed.dev>
 2023-05-30 11:52:14 -07:00
Antonio Scandurra
69e8a166e4 Start on assistant::QuoteSelection 2023-05-30 15:25:53 +02:00
Antonio Scandurra
f67a22828b Show keystroke in panel tooltips 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-05-24 16:13:58 +02:00
Antonio Scandurra
50cfe5eec3 Use cmd-b/cmd-r/cmd-j to toggle left/right/bottom dock and focus when opening 
Also, bind the same keys with shift to toggle the dock without focusing.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-05-24 15:59:06 +02:00
Antonio Scandurra
19b817e48a Improve styling of bottom and right docks 2023-05-23 09:02:45 +02:00
Antonio Scandurra
6f39d49b18 Fix warnings 2023-05-22 19:33:11 +02:00
Antonio Scandurra
048498e39b Test zooming panels 2023-05-22 19:30:31 +02:00
Antonio Scandurra
10e947cb5f Persist project and terminal panel sizes 2023-05-22 15:55:44 +02:00
Antonio Scandurra
146809eef0 Merge branch 'main' into panels 2023-05-22 14:10:17 +02:00
Antonio Scandurra
e49281699c Add new terminal when the terminal panel is activated, and not on focus 2023-05-19 16:07:47 +02:00
Antonio Scandurra
3d6b728364 Activate the correct panel when deserializing workspace 2023-05-19 14:18:11 +02:00
Kirill Bulatov
201d513c50 Show navigation history in the file finder modal 
co-authored-by: Max <max@zed.dev>
 2023-05-18 21:50:38 +03:00
Max Brunsfeld
2d5f03e148 Remove optional path argument when getting settings 2023-05-17 15:05:20 -07:00
Max Brunsfeld
67a25126d4 Define theme/ui text style settings in theme crate 2023-05-17 14:44:59 -07:00
Max Brunsfeld
89204e85c0 Merge branch 'main' into setting-store 2023-05-17 09:55:24 -07:00