Antonio Scandurra
d31b53b912
Extract a gpui::combine_highlights function
2023-11-24 16:31:38 +01:00
Antonio Scandurra
bf39968105
Return TextRuns in combine_syntax_and_fuzzy_match_highlights
2023-11-24 13:00:20 +01:00
Antonio Scandurra
7eeb8078f6
Allow setting text background color via TextStyle
2023-11-23 19:22:18 +01:00
Antonio Scandurra
1ad22231d2
Allow providing a background color in a TextRun
2023-11-23 18:55:16 +01:00
Antonio Scandurra
56d043f671
Allow finding which ranges were clicked on an InteractiveText
2023-11-23 18:08:49 +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
Joseph T. Lyons
f33c0e80a6
Add app events ( #3372 )
...
Adds app events (`first open` and `open`). For the time being, I'm
abandonding trying to add `close`, after running into many issues
trying. The code is in place for me to continue on that work, but at the
moment, we require having the telemetry settings in hand when calling
any of the methods that log an event, so we can honor the user's
preference for sending telemetry or not, but when running the
`on_app_close` method, to send off an app `close` event, the settings
are no longer available (probably the order of teardown?), which causes
some tests to end up failing. I'm not sure how to solve this. Maybe we
keep the settings on the telemetry struct and update it each time any
event is logged, then, on app shutdown, when logging the app `close`
event, we can use the stored version (idk).
Release Notes:
- N/A
2023-11-22 23:16:28 -05:00
Mikayla
6e84d8fbc0
Merge branch 'main' into panic-hunting
2023-11-22 13:47:17 -08:00
Mikayla
eb74ad7caa
Fix failing test
2023-11-22 13:41:48 -08:00
Joseph T. Lyons
ee2b6834bd
Revert "Convert telemetry into a model"
...
This reverts commit 6e4268a471
2023-11-22 16:16:44 -05:00
Joseph T. Lyons
c86e99928b
Merge branch 'main' into add-app-events
2023-11-22 16:16:11 -05:00
Joseph T. Lyons and Julia
6e4268a471
Convert telemetry into a model
...
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com >
2023-11-22 16:16:10 -05:00
Nathan Sobo
c23f17ee0b
Reorganize element-related traits
2023-11-22 11:19:43 -07:00
Antonio Scandurra
eaf90a4fbd
Fix drawing uniform list elements when scrolling
2023-11-22 18:32:02 +01:00
Antonio Scandurra
bd4a710cef
Use interactivity's base style for UniformList
2023-11-22 17:50:34 +01:00
Antonio Scandurra
2b6e8de11f
Don't perform wrapping in completions
2023-11-22 14:23:09 +01:00
Antonio Scandurra
fff2d7955e
Round up line width
2023-11-22 14:01:22 +01:00
Antonio Scandurra
3a8e9b5697
Avoid holding borrow to editor while painting child elements
2023-11-22 11:40:38 +01:00
Joseph T. Lyons and Mikayla
a4a1e6ba98
WIP
...
Co-authored-by: Mikayla <mikayla@zed.dev >
2023-11-21 22:32:07 -05:00
Mikayla and nathan
469b05684f
Fix a few identity mixups in GPUI
...
co-authored-by: nathan <nathan@zed.dev >
2023-11-21 17:12:32 -08:00
Piotr Osiewicz
54a3b56935
Merge remote-tracking branch 'origin/callback-handles' into search2
2023-11-21 00:40:20 +01:00
Conrad Irwin
8b6b7e60be
borrow less
2023-11-20 16:00:47 -07:00
2c4d83c9af
WIP
...
co-authored-by: conrad <conrad@zed.dev >
co-authored-by: Nathan <nathan@zed.dev >
2023-11-20 14:46:01 -08:00
Mikayla
6985b70859
fix gpui2
2023-11-20 11:55:27 -08:00
Conrad Irwin
25ed7c57c1
WIP
2023-11-20 12:34:08 -07:00
Conrad Irwin
d0dd44faad
Merge branch 'main' into callback-handles
2023-11-20 12:21:42 -07:00
Piotr Osiewicz
d60855b06d
Merge branch 'main' into search2
2023-11-20 19:23:35 +01:00
Piotr Osiewicz
07cc5904f8
Merge branch 'main' into search2
2023-11-20 18:37:41 +01:00
Conrad Irwin
5d16f76518
fmt
2023-11-20 10:05:57 -07:00
Conrad Irwin
f86480ba5d
Merge followup mess
2023-11-20 09:58:05 -07:00
Conrad Irwin
0798cfd58c
Merge branch 'main' into derive-element-redux
2023-11-20 09:15:38 -07:00
Mikayla
88024ca7c9
Remove V parameter on elements
2023-11-19 18:32:31 -08:00
Conrad Irwin
c0d85dc1dd
Fix text wrapping when a child of a v_stack() ( #3362 )
...
Previously text that was rendered in a flex-column would reserve the
correct
amount of space during layout, and then paint itself incorrectly.
Release Notes:
- N/A
2023-11-19 11:37:31 -07:00
Conrad Irwin
0711121586
Add some test cases
2023-11-18 22:16:28 -07:00
Nathan Sobo
33cd6f520a
Clean compile with redesigned element traits
2023-11-18 21:51:47 -07:00
Conrad Irwin
cf47ed2c5f
Fix wrapping when parent has a max_width
...
(Also avoid re-wrapping text we already wrapped)
2023-11-18 21:31:16 -07:00
Conrad Irwin
242a0b85b5
Update Taffy to latest main
2023-11-18 21:30:33 -07:00
Conrad Irwin
7172ce37b1
Fix text wrapping when a child of a v_stack()
2023-11-18 20:35:22 -07:00
Nathan Sobo
adc355a1e6
Element refinement passing on ui2
2023-11-18 20:05:47 -07:00
Nathan Sobo
be33f000e2
WIP: Lots of errors, starting on resurrecting derive Element
2023-11-18 00:27:40 -07:00
Nathan Sobo
23ffce9fbe
WIP: Work toward eliminating Component trait
...
This refactor enhances the overall design by promoting reusable and composable UI component structures within the Zed project codebase.
2023-11-18 00:03:23 -07:00
Nathan Sobo
2515bbf990
Move self in Element::paint
...
Remove mutable state borrows in favor of state ownership in render processes to streamline element rendering.
2023-11-17 23:32:55 -07:00
Mikayla Maki
e1285b9780
Add nightly release channel for zed2 ( #3355 )
...
Release Notes:
- N/A
2023-11-17 22:12:18 -08:00
Nathan Sobo
0069dd5ce6
WIP
2023-11-17 20:05:37 -07:00
Mikayla
dd283b471a
Add autoupdate2
...
co-authoredby: max@zed.dev
2023-11-17 15:48:32 -08:00
Julia
189ddf9380
Merge branch 'main' into unborked-git-zed2-diagnostics-view
2023-11-17 16:43:29 -05:00
Julia
3655a96e54
Merge branch 'main' into unborked-git-zed2-diagnostics-view
2023-11-17 16:32:35 -05:00
Julia
c6d22af416
Get diagnostic2 tests building and running
2023-11-17 16:32:35 -05:00
Julia
a464a7da2a
Merge branch 'main' into unborked-git-zed2-diagnostics-view
2023-11-17 16:32:35 -05:00
Julia and Nathan Sobo
f4eb219c75
Get diagnostics view almost building in the zed2 world
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-11-17 16:32:35 -05:00
Antonio Scandurra
Joseph T. Lyons
Mikayla
Nathan Sobo
Piotr Osiewicz
Conrad Irwin
Julia