oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,556 Commits 1 Branch 0 Tags
a526f23c81ec12bcb19a44608cc87bf4178bf2df
Commit Graph
10924 Commits
Author SHA1 Message Date
Nate Butler a526f23c81 Add ui_font settings and set default rem size accordingly (#3346) 
[[PR Description]]
- Adds ui_font_family, ui_font_features, ui_font_size to settings and
default settings
- Use the new ui font settings to set the rem size when the workspace is
created.

Release Notes:

- N/A
 2023-11-16 15:40:33 -05:00
Nate Butler ffd092a098 Add ui_font_* for tests 2023-11-16 15:30:50 -05:00
Nate ButlerandMikayla Maki fa9f4a9355 Init rem_size in the workspace at the start of the render 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-11-16 13:43:36 -05:00
Marshall Bowers b559bfd80f Parameterize theme2::init to allow loading just the base theme (#3345) 
This PR adds a parameter to the `theme2::init` method to indicate what
the theme-loading behavior should be.

This allows us to indicate when we want to load all of the additional
built-in user themes (like in the Zed binary and in the storybook), and
when we don't want to load the user themes (like in tests).

We're using an enum over just a `bool` here for clarity at the call
site.

Release Notes:

- N/A
 2023-11-16 13:03:30 -05:00
Nate ButlerandMarshall Bowers 38d0fdc09a Remove todo 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-16 11:42:23 -05:00
Nate ButlerandMarshall Bowers c71e522b4e Allow users to set UI font properties in their settings 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-11-16 11:37:46 -05:00
Kirill BulatovandPiotr ab0a3f19ab Add an actual context menu into terminal-2 
(click the text, not the pane!)

Co-Authored-By: Piotr <piotr@zed.dev>
 2023-11-16 16:36:44 +02:00
Kirill Bulatov f638d4ce1d Add basic context menu element 2023-11-16 14:35:13 +02:00
Kirill Bulatov 0f0b7090b8 Fix more errors in terminal element 2023-11-16 13:10:43 +02:00
Kirill Bulatov fd61683c46 WIP 2023-11-16 10:40:02 +02:00
Kirill Bulatov e3465fbcf9 Comment out the terminal view 2023-11-16 10:04:20 +02:00
Kirill Bulatov a238368296 More compilation fixes 2023-11-16 10:04:18 +02:00
Kirill BulatovandMikayla Maki 61d6cb880c Start porting terminal_element to gpui2 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-11-16 10:04:03 +02:00
Kirill BulatovandMikayla Maki d89c51135a Start porting terminal_view to gpui2 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-11-16 10:04:03 +02:00
Mikayla 9da0b78ead Merge branch 'main' into tabs-n-splits 2023-11-15 23:41:25 -08:00
Mikayla c70c0f9ae9 Remove initialize_workspace 2023-11-15 23:11:31 -08:00
Conrad Irwin 74afa62a55 Add Overlay component to gpui2 2023-11-15 23:00:36 -07:00
Conrad Irwin 8c14a8fa95 Merge branch 'main' into collab_ui2 2023-11-15 21:04:47 -07:00
Conrad Irwin 0a9fb3978b Enable panel switching 2023-11-15 21:01:00 -07:00
Nathan Sobo e5ada92b7b Remove initialize from the Element trait (#3338) 
Initially, we imagined registering keyboard handlers in the initialize
phase so we would understand the relationships between focus handles
during the layout pass, which would allow us to assign assign `focus_in`
styles that impact layout.

However, we soon realized that many elements aren't created until paint
time anyway, such as within the uniform list. Since it's impossible to
know prior to paint whether an element contains the focused element, it
makes more sense to eliminate the `focus_in` styling helper.

Release Notes:

- N/A
 2023-11-15 19:36:35 -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
Conrad Irwin 7f70712dac Uncomment enough to register the panel 2023-11-15 16:44:21 -07:00
Mikayla e905ababcd Add back splitting 2023-11-15 15:21:19 -08:00
Conrad Irwin 793fa6e3a4 Move placeholder titlebar render to collab_ui 2023-11-15 16:09:21 -07:00
Conrad Irwin 84bcbf1128 Add collab_ui2 2023-11-15 16:08:03 -07:00
Mikayla faf93aed4e checkpoint 2023-11-15 14:17:04 -08:00
Nathan Sobo 4f09633379 Remove focus_in styling helper 2023-11-15 14:17:49 -07:00
Nathan Sobo c6b374ebc9 Remove initialize method from Element trait 2023-11-15 14:11:19 -07:00
Conrad Irwin 0a51784dd0 Leaky, but better, test abstraction 2023-11-15 14:01:10 -07:00
Conrad Irwin 19c0b390d2 FileFinder tests (#3336) 
Also including:
* Fixes for focus when closing the last item in a pane
* Workspace#active_item_as::<Editor>()
* cx.simulate_input()

Release Notes:

- N/A
 2023-11-15 13:24:34 -07:00
Conrad Irwin cebc8428c8 FileFinder tests 2023-11-15 13:16:28 -07:00
Antonio Scandurra 33a808a49b WIP 2023-11-15 20:41:09 +01:00
Antonio ScandurraandNathan Sobo 759ce7440c Avoid unnecessary call to with_element_id in RenderViewWith 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 20:12:30 +01:00
Antonio ScandurraandNathan Sobo 1d04dc5dbf Clear the state of keystroke matchers when focus changes 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 20:11:07 +01:00
Antonio Scandurra 3978d4e872 Show fold indicators (#3334) 
Release Notes:

- N/A
 2023-11-15 20:10:24 +01:00
Antonio Scandurra 08dfcba68a Fix panic when painting blocks 2023-11-15 20:02:35 +01:00
Antonio ScandurraandNathan Sobo c225a3e5af Don't use Mutex or Arc now that app state is not Send 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 18:50:34 +01:00
Antonio ScandurraandNathan Sobo c7b7f7dfd5 Move render_view into View::render_with 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 18:50:09 +01:00
Joseph T. Lyons d791fc707a v0.114.x dev 2023-11-15 12:47:40 -05:00
Antonio ScandurraandNathan Sobo 9ff238921f Fix clicking on code action and fold indicators 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 18:29:53 +01:00
Antonio ScandurraandNathan Sobo 17b8e4a684 Handle clicking folded ranges 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 18:19:26 +01:00
Antonio ScandurraandNathan Sobo 3ff8c78b58 Return a Fold struct when querying the FoldMap 
This contains a new `id` field that lets us distinguish among folds.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-15 17:09:59 +01:00
Conrad Irwin 1db4fab3ab Add command palette tests and simulate_keystrokes (#3330) 
Release Notes:

- N/A
 2023-11-15 08:00:41 -07:00
Kirill Bulatov 888098bad2 More detailed errors when opening files 2023-11-15 16:20:00 +02:00
Antonio Scandurra 851a60a68e Render fold indicators in the gutter 2023-11-15 14:07:37 +01:00
Antonio Scandurra 786cc59d7a Fix formatting 2023-11-15 11:07:32 +01:00
Antonio Scandurra 45381e566c Fix focus management on editor when renaming 2023-11-15 11:05:09 +01:00
Antonio Scandurra 003e4bc241 Extract out a register_actions function 2023-11-15 09:53:32 +01:00
Antonio Scandurra feeb44c122 Merge remote-tracking branch 'origin/main' into editor2-rename 
# Conflicts:
#	crates/editor2/src/editor.rs
#	crates/editor2/src/element.rs
#	crates/gpui2/src/style.rs
 2023-11-15 09:51:33 +01:00
Antonio Scandurra c3094b7c3d Introduce gpui::render_view 2023-11-15 09:45:23 +01:00