diff --git a/assets/voxygen/element/frames/bubble/bottom.png b/assets/voxygen/element/frames/bubble/bottom.png index 176620d939..70f07ddd59 100644 Binary files a/assets/voxygen/element/frames/bubble/bottom.png and b/assets/voxygen/element/frames/bubble/bottom.png differ diff --git a/assets/voxygen/element/frames/bubble/bottom_left.png b/assets/voxygen/element/frames/bubble/bottom_left.png index a29e659ba1..6147effe8d 100644 Binary files a/assets/voxygen/element/frames/bubble/bottom_left.png and b/assets/voxygen/element/frames/bubble/bottom_left.png differ diff --git a/assets/voxygen/element/frames/bubble/bottom_right.png b/assets/voxygen/element/frames/bubble/bottom_right.png index a8d2ad180e..fd22bb9570 100644 Binary files a/assets/voxygen/element/frames/bubble/bottom_right.png and b/assets/voxygen/element/frames/bubble/bottom_right.png differ diff --git a/assets/voxygen/element/frames/bubble/left.png b/assets/voxygen/element/frames/bubble/left.png index 8a4234273f..6db85e6d83 100644 Binary files a/assets/voxygen/element/frames/bubble/left.png and b/assets/voxygen/element/frames/bubble/left.png differ diff --git a/assets/voxygen/element/frames/bubble/right.png b/assets/voxygen/element/frames/bubble/right.png index 72c12866bf..583c736e5b 100644 Binary files a/assets/voxygen/element/frames/bubble/right.png and b/assets/voxygen/element/frames/bubble/right.png differ diff --git a/assets/voxygen/element/frames/bubble/tail.png b/assets/voxygen/element/frames/bubble/tail.png index ecbd89244e..97085ba162 100644 Binary files a/assets/voxygen/element/frames/bubble/tail.png and b/assets/voxygen/element/frames/bubble/tail.png differ diff --git a/assets/voxygen/element/frames/bubble/top.png b/assets/voxygen/element/frames/bubble/top.png index e0141953fd..da43009598 100644 Binary files a/assets/voxygen/element/frames/bubble/top.png and b/assets/voxygen/element/frames/bubble/top.png differ diff --git a/assets/voxygen/element/frames/bubble/top_left.png b/assets/voxygen/element/frames/bubble/top_left.png index 34e717bef3..bf46400ff4 100644 Binary files a/assets/voxygen/element/frames/bubble/top_left.png and b/assets/voxygen/element/frames/bubble/top_left.png differ diff --git a/assets/voxygen/element/frames/bubble/top_right.png b/assets/voxygen/element/frames/bubble/top_right.png index 7930e83723..a6600439b9 100644 Binary files a/assets/voxygen/element/frames/bubble/top_right.png and b/assets/voxygen/element/frames/bubble/top_right.png differ diff --git a/assets/voxygen/element/frames/bubble_dark/bottom.png b/assets/voxygen/element/frames/bubble_dark/bottom.png index 073806a134..8add83cd04 100644 Binary files a/assets/voxygen/element/frames/bubble_dark/bottom.png and b/assets/voxygen/element/frames/bubble_dark/bottom.png differ diff --git a/assets/voxygen/element/frames/bubble_dark/bottom_left.png b/assets/voxygen/element/frames/bubble_dark/bottom_left.png index 716055e486..505b93ee35 100644 Binary files a/assets/voxygen/element/frames/bubble_dark/bottom_left.png and b/assets/voxygen/element/frames/bubble_dark/bottom_left.png differ diff --git a/assets/voxygen/element/frames/bubble_dark/bottom_right.png b/assets/voxygen/element/frames/bubble_dark/bottom_right.png index 648ffd67d7..e1ca9c56f7 100644 Binary files a/assets/voxygen/element/frames/bubble_dark/bottom_right.png and b/assets/voxygen/element/frames/bubble_dark/bottom_right.png differ diff --git a/assets/voxygen/element/frames/bubble_dark/left.png b/assets/voxygen/element/frames/bubble_dark/left.png index f00f14906b..171ab0e814 100644 Binary files a/assets/voxygen/element/frames/bubble_dark/left.png and b/assets/voxygen/element/frames/bubble_dark/left.png differ diff --git a/assets/voxygen/element/frames/bubble_dark/right.png b/assets/voxygen/element/frames/bubble_dark/right.png index 076ec38db2..8c975f6904 100644 Binary files a/assets/voxygen/element/frames/bubble_dark/right.png and b/assets/voxygen/element/frames/bubble_dark/right.png differ diff --git a/assets/voxygen/element/frames/bubble_dark/tail.png b/assets/voxygen/element/frames/bubble_dark/tail.png index 4193e467b7..a9a9f4e478 100644 Binary files a/assets/voxygen/element/frames/bubble_dark/tail.png and b/assets/voxygen/element/frames/bubble_dark/tail.png differ diff --git a/assets/voxygen/element/frames/bubble_dark/top.png b/assets/voxygen/element/frames/bubble_dark/top.png index b2e95951b6..afe8249bcb 100644 Binary files a/assets/voxygen/element/frames/bubble_dark/top.png and b/assets/voxygen/element/frames/bubble_dark/top.png differ diff --git a/assets/voxygen/element/frames/bubble_dark/top_left.png b/assets/voxygen/element/frames/bubble_dark/top_left.png index 72b08fbd1a..ab289c2329 100644 Binary files a/assets/voxygen/element/frames/bubble_dark/top_left.png and b/assets/voxygen/element/frames/bubble_dark/top_left.png differ diff --git a/assets/voxygen/element/frames/bubble_dark/top_right.png b/assets/voxygen/element/frames/bubble_dark/top_right.png index c52ce11111..d59b54308a 100644 Binary files a/assets/voxygen/element/frames/bubble_dark/top_right.png and b/assets/voxygen/element/frames/bubble_dark/top_right.png differ diff --git a/voxygen/src/hud/overhead.rs b/voxygen/src/hud/overhead.rs index bfe14afd76..238f48a3d2 100644 --- a/voxygen/src/hud/overhead.rs +++ b/voxygen/src/hud/overhead.rs @@ -150,7 +150,7 @@ impl<'a> Widget for Overhead<'a> { let mut text = Text::new(&bubble_contents) .font_id(self.fonts.cyri.conrod_id) .font_size(18) - .up_from(state.ids.name, 10.0) + .up_from(state.ids.name, 20.0) .x_align_to(state.ids.name, Align::Middle) .parent(id); text = if dark_mode { @@ -168,8 +168,8 @@ impl<'a> Widget for Overhead<'a> { } else { self.imgs.speech_bubble_top_left }) - .w_h(10.0, 10.0) - .top_left_with_margin_on(state.ids.speech_bubble_text, -10.0) + .w_h(16.0, 16.0) + .top_left_with_margin_on(state.ids.speech_bubble_text, -20.0) .parent(id) .set(state.ids.speech_bubble_top_left, ui); Image::new(if dark_mode { @@ -177,9 +177,9 @@ impl<'a> Widget for Overhead<'a> { } else { self.imgs.speech_bubble_top }) - .h(10.0) - .w_of(state.ids.speech_bubble_text) - .mid_top_with_margin_on(state.ids.speech_bubble_text, -10.0) + .h(16.0) + .padded_w_of(state.ids.speech_bubble_text, -4.0) + .mid_top_with_margin_on(state.ids.speech_bubble_text, -20.0) .parent(id) .set(state.ids.speech_bubble_top, ui); Image::new(if dark_mode { @@ -187,8 +187,8 @@ impl<'a> Widget for Overhead<'a> { } else { self.imgs.speech_bubble_top_right }) - .w_h(10.0, 10.0) - .top_right_with_margin_on(state.ids.speech_bubble_text, -10.0) + .w_h(16.0, 16.0) + .top_right_with_margin_on(state.ids.speech_bubble_text, -20.0) .parent(id) .set(state.ids.speech_bubble_top_right, ui); Image::new(if dark_mode { @@ -196,9 +196,9 @@ impl<'a> Widget for Overhead<'a> { } else { self.imgs.speech_bubble_left }) - .w(10.0) - .h_of(state.ids.speech_bubble_text) - .mid_left_with_margin_on(state.ids.speech_bubble_text, -10.0) + .w(16.0) + .padded_h_of(state.ids.speech_bubble_text, -4.0) + .mid_left_with_margin_on(state.ids.speech_bubble_text, -20.0) .parent(id) .set(state.ids.speech_bubble_left, ui); Image::new(if dark_mode { @@ -206,8 +206,8 @@ impl<'a> Widget for Overhead<'a> { } else { self.imgs.speech_bubble_mid }) - .wh_of(state.ids.speech_bubble_text) - .top_left_of(state.ids.speech_bubble_text) + .padded_wh_of(state.ids.speech_bubble_text, -4.0) + .top_left_with_margin_on(state.ids.speech_bubble_text, -4.0) .parent(id) .set(state.ids.speech_bubble_mid, ui); Image::new(if dark_mode { @@ -215,9 +215,9 @@ impl<'a> Widget for Overhead<'a> { } else { self.imgs.speech_bubble_right }) - .w(10.0) - .h_of(state.ids.speech_bubble_text) - .mid_right_with_margin_on(state.ids.speech_bubble_text, -10.0) + .w(16.0) + .padded_h_of(state.ids.speech_bubble_text, -4.0) + .mid_right_with_margin_on(state.ids.speech_bubble_text, -20.0) .parent(id) .set(state.ids.speech_bubble_right, ui); Image::new(if dark_mode { @@ -225,8 +225,8 @@ impl<'a> Widget for Overhead<'a> { } else { self.imgs.speech_bubble_bottom_left }) - .w_h(10.0, 10.0) - .bottom_left_with_margin_on(state.ids.speech_bubble_text, -10.0) + .w_h(16.0, 16.0) + .bottom_left_with_margin_on(state.ids.speech_bubble_text, -20.0) .parent(id) .set(state.ids.speech_bubble_bottom_left, ui); Image::new(if dark_mode { @@ -234,9 +234,9 @@ impl<'a> Widget for Overhead<'a> { } else { self.imgs.speech_bubble_bottom }) - .h(10.0) - .w_of(state.ids.speech_bubble_text) - .mid_bottom_with_margin_on(state.ids.speech_bubble_text, -10.0) + .h(16.0) + .padded_w_of(state.ids.speech_bubble_text, -4.0) + .mid_bottom_with_margin_on(state.ids.speech_bubble_text, -20.0) .parent(id) .set(state.ids.speech_bubble_bottom, ui); Image::new(if dark_mode { @@ -244,8 +244,8 @@ impl<'a> Widget for Overhead<'a> { } else { self.imgs.speech_bubble_bottom_right }) - .w_h(10.0, 10.0) - .bottom_right_with_margin_on(state.ids.speech_bubble_text, -10.0) + .w_h(16.0, 16.0) + .bottom_right_with_margin_on(state.ids.speech_bubble_text, -20.0) .parent(id) .set(state.ids.speech_bubble_bottom_right, ui); let tail = Image::new(if dark_mode { @@ -253,8 +253,8 @@ impl<'a> Widget for Overhead<'a> { } else { self.imgs.speech_bubble_tail }) - .w_h(11.0, 16.0) - .mid_bottom_with_margin_on(state.ids.speech_bubble_text, -16.0) + .w_h(22.0, 28.0) + .mid_bottom_with_margin_on(state.ids.speech_bubble_text, -32.0) .parent(id); // Move text to front (conrod depth is lowest first; not a z-index) tail.set(state.ids.speech_bubble_tail, ui);