Mainline GPUI2 UI work (#3079)

This PR mainlines the current state of new GPUI2-based UI from the
`gpui2-ui` branch.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Co-authored-by: Nate <nate@zed.dev>
This commit is contained in:
Marshall Bowers 2023-10-02 18:20:47 -04:00 committed by GitHub
parent 08361eb84e
commit 9e1f7c4c18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 1047 additions and 399 deletions

View file

@ -84,6 +84,7 @@ pub enum Icon {
Plus,
Quote,
Screen,
SelectAll,
Split,
SplitMessage,
Terminal,
@ -131,6 +132,7 @@ impl Icon {
Icon::Plus => "icons/plus.svg",
Icon::Quote => "icons/quote.svg",
Icon::Screen => "icons/desktop.svg",
Icon::SelectAll => "icons/select-all.svg",
Icon::Split => "icons/split.svg",
Icon::SplitMessage => "icons/split_message.svg",
Icon::Terminal => "icons/terminal.svg",

View file

@ -81,6 +81,7 @@ impl Input {
div()
.h_7()
.w_full()
.px_2()
.border()
.border_color(border_color_default)

View file

@ -65,7 +65,7 @@ impl PlayerCallStatus {
}
}
#[derive(Clone)]
#[derive(PartialEq, Clone)]
pub struct Player {
index: usize,
avatar_src: String,
@ -73,6 +73,7 @@ pub struct Player {
status: PlayerStatus,
}
#[derive(Clone)]
pub struct PlayerWithCallStatus {
player: Player,
call_status: PlayerCallStatus,