Conrad Irwin
5083adda17
Silence problem
2023-11-08 12:37:35 -07:00
Conrad Irwin
185d8f7a15
Merge branch 'main' into add-collab-tests
2023-11-08 12:33:15 -07:00
Mikayla
738ca57aba
Merge branch 'main' into go-to-line2
2023-11-08 11:32:36 -08:00
Nate Butler
7a7cc4d086
BROKEN: Checkpoint
2023-11-08 14:29:38 -05:00
Mikayla
65345a5023
Fix double borrow in synchronous tests
2023-11-08 11:23:35 -08:00
Max Brunsfeld
aa0f49d6b3
Merge branch 'main' into picker-actions
2023-11-08 10:49:44 -08:00
5fb0fdd52e
Preserve stateless interactivity when assigning elements an id
...
Co-authored-by: Nathan <nathan@zed.dev >
Co-authored-by: Piotr <piotr@zed.dev >
2023-11-08 10:45:10 -08:00
Mikayla
991c40b727
Get tests green
2023-11-08 10:38:43 -08:00
Marshall Bowers
5fb37a8deb
Remove unused SceneBuilder constructor
2023-11-08 13:30:20 -05:00
8b1491bfb0
Extract a Frame struct from Window
...
Co-Authored-By: Marshall <marshall@zed.dev >
Co-Authored-By: Nathan <nathan@zed.dev >
Co-Authored-By: Piotr <piotr@zed.dev >
2023-11-08 13:24:11 -05:00
Antonio Scandurra and Marshall
330a7ea602
Introduce ViewContext::on_blur
...
Co-Authored-By: Marshall <marshall@zed.dev >
2023-11-08 19:09:01 +01:00
Antonio Scandurra and Marshall
b7903e2199
Fix blinking behavior in editor when receiving/losing focus
...
Co-Authored-By: Marshall <marshall@zed.dev >
2023-11-08 19:03:57 +01:00
Nate Butler
6257c42f5c
Update titlebar
2023-11-08 12:57:31 -05:00
Nate Butler
e6dabbda75
add ui_text_size functions
2023-11-08 12:57:24 -05:00
Mikayla
2bda91180c
Merge branch 'main' into add-collab-tests
2023-11-08 09:57:08 -08:00
Mikayla
34a01d2565
Merge branch 'main' into add-collab-tests
2023-11-08 09:41:57 -08:00
Max Brunsfeld
8feec8108e
Register menu2 actions using actions macro
2023-11-08 09:35:19 -08:00
5dfcae922f
Extract a Frame struct from Window
...
Co-Authored-By: Marshall <marshall@zed.dev >
Co-Authored-By: Nathan <nathan@zed.dev >
Co-Authored-By: Piotr <piotr@zed.dev >
2023-11-08 18:17:38 +01:00
Antonio Scandurra
4db70841a6
Fix clipping bugs in editor2 ( #3269 )
...
Release Notes:
- N/A
2023-11-08 17:51:39 +01:00
Marshall Bowers
9f7bef63b3
Port the picker and uniform list ( #3248 )
...
This adds a `UniformList` element and partially implements `Picker` as a
component, using `UniformList`. Because editor2 isn't fully implemented
yet, the picker doesn't have filtering logic yet. We want to merge this
for now though, to make the UniformList element available for other
crates.
Release Notes:
- N/A
2023-11-08 17:45:23 +01:00
Marshall Bowers
8f89c1e77b
Replace GitStatusColors with StatusColors ( #3268 )
...
This PR removes `GitStatusColors` in favor of just using `StatusColors`
instead.
Release Notes:
- N/A
2023-11-08 11:32:32 -05:00
86408a2a85
Fix clipping in Line::draw
...
Co-Authored-By: Nathan <nathan@zed.dev >
Co-Authored-By: Marshall <marshall@zed.dev >
2023-11-08 17:32:21 +01:00
Antonio Scandurra and Nathan
66eb8deb10
Use a consistent clipping strategy for drawing all the primitives
...
Co-Authored-By: Nathan <nathan@zed.dev >
2023-11-08 17:29:05 +01:00
Marshall Bowers
7896996c5c
Fix overflow in UniformList
2023-11-08 11:26:26 -05:00
Marshall Bowers
443543c4a8
Merge branch 'main' into picker
2023-11-08 11:18:54 -05:00
Joseph T. Lyons
3ffe1f8323
v0.113.x dev
2023-11-08 10:53:37 -05:00
Antonio Scandurra
ef746a7850
💄
2023-11-08 15:33:11 +01:00
Antonio Scandurra
cdf34d6847
Determine whether the gutter was hovered
2023-11-08 15:30:41 +01:00
Antonio Scandurra
67587e1c9f
Handle MouseUpEvent in editor2
2023-11-08 15:17:30 +01:00
Antonio Scandurra
679a424cfa
Move building of key listeners outside of EditorElement::initialize
2023-11-08 15:12:54 +01:00
Antonio Scandurra and Piotr
80153eac26
Clear hover background highlights
...
Co-Authored-By: Piotr <piotr@zed.dev >
2023-11-08 15:08:54 +01:00
Piotr Osiewicz and Antonio
5aca7c134f
Uncomment mouse_dragged event
...
Co-authored-by: Antonio <antonio@zed.dev >
2023-11-08 15:02:35 +01:00
Piotr Osiewicz and Antonio
e51bbf5e31
Extract mouse event handlers into paint_mouse_listeners
...
Co-authored-by: Antonio <antonio@zed.dev >
2023-11-08 14:40:08 +01:00
Piotr Osiewicz and Antonio
88292143b6
Hook up mouse_down function handler
...
Co-authored-by: Antonio <antonio@zed.dev >
2023-11-08 14:36:05 +01:00
Piotr Osiewicz and Antonio
cf2db788b3
Pass text_bounds instead of full editor bounds into mouse_moved.
...
Co-authored-by: Antonio <antonio@zed.dev >
2023-11-08 14:28:16 +01:00
Piotr Osiewicz
5c2b0222b8
uncomment show_hover
2023-11-08 14:24:28 +01:00
Piotr Osiewicz
3172fe1347
uncomment mouse moved
2023-11-08 14:24:28 +01:00
Antonio Scandurra
3761ddc44e
gpui2: Type-erase futures. ( #3266 )
...
Project2's LLVM IR size is ~33-44% bigger than project1 due to the fact
that in gpui2 we call async_task::spawn(_local) with impl Future instead
of dyn Future, which leads to quite a few more instantiations of
RawTask.
LLVM-IR size for project2:
| build_type | main | this branch | project1 |
| debug | 2617795 | 2022814 | 1817866 |
| release | 4439033 | 3715086 | 3314489 |
Note that this PR is in line with what was done in GPUI1 (we've also
boxed futures there).
Release Notes:
- N/A
2023-11-08 14:21:40 +01:00
Piotr Osiewicz
afd33a5881
gpui2: Type-erase futures.
...
Project2's LLVM IR size is ~20-25% bigger than project1 due to the fact that in gpui2 we call async_task::spawn(_local) with impl Future instead of dyn Future, which leads to quite a few more instantiations of RawTask.
LLVM-IR size for project2:
| build_type | main | this branch | project1 |
| debug | 2617795 | 2022814 | 1817866 |
| release | 4439033 | 3715086 | 3314489 |
2023-11-08 13:06:28 +01:00
Antonio Scandurra and Piotr
9e4ecdadc0
Fix warnings when generating function name for ctor
...
Co-Authored-By: Piotr <piotr@zed.dev >
2023-11-08 12:31:35 +01:00
Antonio Scandurra and Piotr
7fe0dda068
Don't alpha blend when rasterizing paths
...
Co-Authored-By: Piotr <piotr@zed.dev >
2023-11-08 12:04:25 +01:00
Antonio Scandurra
00932568f2
Re-enable most of the functionalities in editor2
2023-11-08 11:30:32 +01:00
Nate Butler
1854ce79d5
Document ColorScaleSteps
2023-11-08 00:45:05 -05:00
Nathan Sobo
1907b5e5f4
Remove call to removed method
2023-11-07 21:58:46 -07:00
Nathan Sobo
513c56ca34
Merge remote-tracking branch 'origin/main' into register-actions
2023-11-07 21:56:08 -07:00
Nathan Sobo
f5930b86ae
Simplify actions macro.
2023-11-07 21:48:47 -07:00
Nathan Sobo
bcf8a98ff7
Docs and cleanup
2023-11-07 21:26:51 -07:00
Nathan Sobo
a2fac01ccf
Register actions globally before main
2023-11-07 20:58:37 -07:00
Nathan Sobo
e6128e3c91
WIP
2023-11-07 20:23:02 -07:00
Nate Butler
bbabbb2860
Add new default player colors and the players story.
2023-11-07 21:51:12 -05:00
Conrad Irwin