Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pfau/fix_chat_cutting' into 'master'

Browse Source 
Fix cut off chat

See merge request veloren/veloren!1218
This commit is contained in:
Monty Marz
2020-07-18 21:56:45 +00:00
parent e5ebc3238a 87079b3bba
commit 3729c08d3e
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
voxygen/src/hud/chat.rs
View File

@ -30,6 +30,8 @@ widget_ids! {
chat_icons[], chat_icons[],
} }
} }
/*#[const_tweaker::tweak(min = 0.0, max = 60.0, step = 1.0)]
const X: f64 = 18.0;*/
const MAX_MESSAGES: usize = 100; const MAX_MESSAGES: usize = 100;
@ -316,7 +318,7 @@ impl<'a> Widget for Chat<'a> {
.set(state.ids.message_box_bg, ui); .set(state.ids.message_box_bg, ui);
let (mut items, _) = List::flow_down(state.messages.len() + 1) let (mut items, _) = List::flow_down(state.messages.len() + 1)
.top_left_with_margins_on(state.ids.message_box_bg, 0.0, 16.0) .top_left_with_margins_on(state.ids.message_box_bg, 0.0, 16.0)
.w_h(CHAT_BOX_WIDTH, CHAT_BOX_HEIGHT) .w_h(CHAT_BOX_WIDTH - 16.0, CHAT_BOX_HEIGHT)
.scroll_kids_vertically() .scroll_kids_vertically()
.set(state.ids.message_box, ui); .set(state.ids.message_box, ui);
if state.ids.chat_icons.len() < state.messages.len() { if state.ids.chat_icons.len() < state.messages.len() {
@ -337,7 +339,7 @@ impl<'a> Widget for Chat<'a> {
let text = Text::new(&msg) let text = Text::new(&msg)
.font_size(self.fonts.opensans.scale(15)) .font_size(self.fonts.opensans.scale(15))
.font_id(self.fonts.opensans.conrod_id) .font_id(self.fonts.opensans.conrod_id)
.w(CHAT_BOX_WIDTH - 16.0) .w(CHAT_BOX_WIDTH - 17.0)
.color(color) .color(color)
.line_spacing(2.0); .line_spacing(2.0);
// Add space between messages. // Add space between messages.

3
voxygen/src/main.rs
View File

@ -22,9 +22,6 @@ use std::panic;
use tracing::{error, warn}; use tracing::{error, warn};
fn main() { fn main() {
#[cfg(feature = "tweak")]
const_tweaker::run().expect("Could not run server");
// Load the settings // Load the settings
// Note: This won't log anything due to it being called before // Note: This won't log anything due to it being called before
// `logging::init`. The issue is we need to read a setting to decide // `logging::init`. The issue is we need to read a setting to decide