Merge pull request #965 from zed-industries/avatar-margin

Antonio Scandurra created 3 years ago

Parameterize `avatar_margin` and assign it a default of 8

Change summary

assets/themes/cave-dark.json         | 1 +
assets/themes/cave-light.json        | 1 +
assets/themes/dark.json              | 1 +
assets/themes/light.json             | 1 +
assets/themes/solarized-dark.json    | 1 +
assets/themes/solarized-light.json   | 1 +
assets/themes/sulphurpool-dark.json  | 1 +
assets/themes/sulphurpool-light.json | 1 +
crates/theme/src/theme.rs            | 1 +
crates/workspace/src/workspace.rs    | 2 +-
styles/src/styleTree/workspace.ts    | 1 +
11 files changed, 11 insertions(+), 1 deletion(-)

Detailed changes

assets/themes/cave-dark.json 🔗

@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#26232a",
       "padding": {

assets/themes/cave-light.json 🔗

@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#e2dfe7",
       "padding": {

assets/themes/dark.json 🔗

@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#2b2b2b",
       "padding": {

assets/themes/light.json 🔗

@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#eaeaea",
       "padding": {

assets/themes/solarized-dark.json 🔗

@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#073642",
       "padding": {

assets/themes/solarized-light.json 🔗

@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#eee8d5",
       "padding": {

assets/themes/sulphurpool-dark.json 🔗

@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#293256",
       "padding": {

assets/themes/sulphurpool-light.json 🔗

@@ -346,6 +346,7 @@
     },
     "titlebar": {
       "avatar_width": 18,
+      "avatar_margin": 8,
       "height": 33,
       "background": "#dfe2f1",
       "padding": {

crates/theme/src/theme.rs 🔗

@@ -53,6 +53,7 @@ pub struct Titlebar {
     pub height: f32,
     pub title: TextStyle,
     pub avatar_width: f32,
+    pub avatar_margin: f32,
     pub avatar_ribbon: AvatarRibbon,
     pub offline_icon: OfflineIcon,
     pub share_icon: Interactive<ShareIcon>,

crates/workspace/src/workspace.rs 🔗

@@ -1629,7 +1629,7 @@ impl Workspace {
             .constrained()
             .with_width(theme.workspace.titlebar.avatar_width)
             .contained()
-            .with_margin_left(2.)
+            .with_margin_left(theme.workspace.titlebar.avatar_margin)
             .boxed();
 
         if let Some(peer_id) = peer_id {

styles/src/styleTree/workspace.ts 🔗

@@ -61,6 +61,7 @@ export default function workspace(theme: Theme) {
     statusBar: statusBar(theme),
     titlebar: {
       avatarWidth: 18,
+      avatarMargin: 8,
       height: 33,
       background: backgroundColor(theme, 100),
       padding: {