Merge remote-tracking branch 'origin/main' into room

2022-10-10 15:43:38 +02:00
parent 3396a98978 e96abf1429
commit afaacba41f
92 changed files with 10800 additions and 6586 deletions
@@ -510,8 +510,7 @@ pub struct Editor {
    pub rename_fade: f32,
    pub document_highlight_read_background: Color,
    pub document_highlight_write_background: Color,
-    pub diff_background_deleted: Color,
-    pub diff_background_inserted: Color,
+    pub diff: DiffStyle,
    pub line_number: Color,
    pub line_number_active: Color,
    pub guest_selections: Vec<SelectionStyle>,
@@ -595,6 +594,16 @@ pub struct CodeActions {
    pub vertical_scale: f32,
 }

+#[derive(Clone, Deserialize, Default)]
+pub struct DiffStyle {
+    pub inserted: Color,
+    pub modified: Color,
+    pub deleted: Color,
+    pub removed_width_em: f32,
+    pub width_em: f32,
+    pub corner_radius: f32,
+}
+
 #[derive(Debug, Default, Clone, Copy)]
 pub struct Interactive<T> {
    pub default: T,