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
Nathan Sobo
c23f17ee0b
Reorganize element-related traits
2023-11-22 11:19:43 -07:00
Mikayla
469b05684f
Fix a few identity mixups in GPUI
...
co-authored-by: nathan <nathan@zed.dev>
2023-11-21 17:12:32 -08:00
Nate Butler
453aa5ffd7
TextColor -> Color
2023-11-21 01:05:29 -05:00
Piotr Osiewicz
54a3b56935
Merge remote-tracking branch 'origin/callback-handles' into search2
2023-11-21 00:40:20 +01:00
Mikayla
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
Piotr Osiewicz
07cc5904f8
Merge branch 'main' into search2
2023-11-20 18:37:41 +01:00
Conrad Irwin
0798cfd58c
Merge branch 'main' into derive-element-redux
2023-11-20 09:15:38 -07:00
Nathan Sobo
33cd6f520a
Clean compile with redesigned element traits
2023-11-18 21:51:47 -07:00
Nathan Sobo
0673606de8
WIP
2023-11-18 20:22:43 -07:00
Mikayla
55dbcf2039
Remove unused imports
2023-11-17 23:14:14 -08:00
Nate Butler
f9804feefa
Remove flex_1 from bottom dock to fix pane group spacing
2023-11-18 02:06:51 -05:00
Piotr Osiewicz
dca2dc7b6b
Merge branch 'main' into search2
2023-11-17 13:22:30 +01:00
Mikayla
9a3cd073c7
Restore a bunch of random workspace stuff
2023-11-16 23:05:28 -08:00
Mikayla
4de2c0f7ef
Re-implement actions as derive macros instead of blanket impls
2023-11-16 17:32:02 -08:00
Piotr Osiewicz
6b6a30c3da
Merge branch 'main' into search2
2023-11-16 17:16:15 +01:00
Kirill Bulatov
a238368296
More compilation fixes
2023-11-16 10:04:18 +02:00
Mikayla
9da0b78ead
Merge branch 'main' into tabs-n-splits
2023-11-15 23:41:25 -08:00
Conrad Irwin
0a9fb3978b
Enable panel switching
2023-11-15 21:01:00 -07:00
Mikayla
78cea69172
Add focusable view and restore workspace deserialization. Partially restore split and tab functions
2023-11-15 16:36:43 -08:00
Mikayla
e905ababcd
Add back splitting
2023-11-15 15:21:19 -08:00
Mikayla
faf93aed4e
checkpoint
2023-11-15 14:17:04 -08:00
Conrad Irwin
cebc8428c8
FileFinder tests
2023-11-15 13:16:28 -07:00
Piotr Osiewicz
b11bfa8821
Merge branch 'main' into search2
2023-11-15 12:54:26 +01:00
Conrad Irwin
37d0b8424c
Merge branch 'main' into element-types
2023-11-14 12:10:26 -07:00
Marshall Bowers
76c15229c1
Combine LabelColor and IconColor into TextColor
2023-11-14 13:48:01 -05:00
Conrad Irwin
5dda105182
Merge branch 'main' into element-types
2023-11-14 11:45:19 -07:00
Antonio Scandurra
d855e91e43
Honor cmd-w to close active item
...
Co-Authored-By: Julia <julia@zed.dev>
2023-11-14 16:38:20 +01:00
Nathan Sobo
6abaacc457
Fix formatting
2023-11-14 01:58:10 -07:00
Nathan Sobo
364e3e7de5
Merge remote-tracking branch 'origin/main' into element-types
2023-11-14 01:55:58 -07:00
Nathan Sobo
c6e8a097a3
Rename back to div
2023-11-14 01:41:55 -07:00
Nathan Sobo
27fb381cca
Checkpoint
2023-11-14 01:15:48 -07:00
Marshall Bowers
92f2e8eb34
Combine related conditions
2023-11-13 18:22:04 -05:00
Nate Butler
701f954448
Start refining tab
2023-11-13 17:51:58 -05:00
Piotr Osiewicz
dfd68d4cb8
WIP: start search2
2023-11-13 20:38:37 +01:00
Mikayla
a97c8bf58f
Get workspace compiling with new event emitters
2023-11-08 19:29:00 -08:00
Conrad Irwin
c59817cd72
Merge branch 'main' into editor2-rendering
2023-11-06 11:06:43 -07:00
Conrad Irwin
3afdeeac1e
tooltip2 ( #3237 )
...
- Fix executor.timer() in gpui2
- Add support for tooltips
[[PR Description]]
Release Notes:
- N/A
2023-11-06 10:51:01 -07:00
Marshall Bowers
bf80c1da5b
Rename fields in ThemeColors ( #3242 )
...
This PR applies a number of field renames in the `ThemeColors` struct
from the `import-theme` branch.
This will help prevent this branch from diverging too far from `main`.
Release Notes:
- N/A
---------
Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-06 11:53:27 -05:00
Julia
4725cd2cd6
Move more tooltip logic into gpui2 & fix tooltip moving on paint
...
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-03 18:37:15 -04:00
Julia
3834e26f71
Tooltips in mouse event handler & fix executor timer
...
Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2023-11-03 18:02:58 -04:00
Marshall Bowers
b5224bdafd
Remove unneeded type qualification
2023-11-03 16:40:46 -04:00
Marshall Bowers
1361b61708
Use an IconButton for the tab close button
2023-11-03 16:36:02 -04:00
Conrad Irwin
33245d119e
Tooltip on tabs
...
Co-Authored-By: Julia <julia@zed.dev>
2023-11-03 14:02:46 -06:00
Conrad Irwin
26e64fb843
gpui2: Add on_hover events
2023-11-03 12:51:38 -06:00
Conrad Irwin
d73c54f604
Add PointingHand on tabs
2023-11-03 11:30:15 -06:00
Conrad Irwin
c604a2e34e
Add hover behaviour to tabs
...
Co-Authored-By: Marshall <marshall@zed.dev>
Co-Authored-By: Nathan <nathan@zed.dev>
2023-11-03 10:55:07 -06:00
Conrad Irwin
920ea1bf0a
Make the close button close
2023-11-03 09:20:27 -06:00
Antonio Scandurra
b5c2cf371a
Ensure panes cover the available space
2023-11-03 16:14:03 +01:00
