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

Basic resize functionality

Browse Source
This commit is contained in:
Syniis 2024-01-28 18:14:41 +01:00
parent e9a04db92c
commit eec1b57a5c
2 changed files with 46 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ use conrod_core::{
use i18n::Localization; use i18n::Localization;
use i18n_helpers::localize_chat_message; use i18n_helpers::localize_chat_message;
use std::collections::{HashSet, VecDeque}; use std::collections::{HashSet, VecDeque};
use vek::Vec2;
widget_ids! { widget_ids! {
struct Ids { struct Ids {
@ -53,9 +54,11 @@ const MAX_MESSAGES: usize = 100;
const CHAT_ICON_WIDTH: f64 = 16.0; const CHAT_ICON_WIDTH: f64 = 16.0;
const CHAT_MARGIN_THICKNESS: f64 = 2.0; const CHAT_MARGIN_THICKNESS: f64 = 2.0;
const CHAT_ICON_HEIGHT: f64 = 16.0; const CHAT_ICON_HEIGHT: f64 = 16.0;
const CHAT_BOX_WIDTH: f64 = 470.0; pub const DEFAULT_CHAT_BOX_WIDTH: f64 = 470.0;
const CHAT_BOX_INPUT_WIDTH: f64 = 460.0 - CHAT_ICON_WIDTH - 1.0; const CHAT_BOX_INPUT_WIDTH: f64 = 460.0 - CHAT_ICON_WIDTH - 1.0;
const CHAT_BOX_HEIGHT: f64 = 154.0; pub const DEFAULT_CHAT_BOX_HEIGHT: f64 = 154.0;
const MIN_DIMENSION: Vec2<f64> = Vec2::new(300., 100.);
const MAX_DIMENSION: Vec2<f64> = Vec2::new(650., 500.);
const CHAT_TAB_HEIGHT: f64 = 20.0; const CHAT_TAB_HEIGHT: f64 = 20.0;
const CHAT_TAB_ALL_WIDTH: f64 = 40.0; const CHAT_TAB_ALL_WIDTH: f64 = 40.0;
@ -78,6 +81,7 @@ pub struct Chat<'a> {
// TODO: add an option to adjust this // TODO: add an option to adjust this
history_max: usize, history_max: usize,
chat_size: Vec2<f64>,
localized_strings: &'a Localization, localized_strings: &'a Localization,
} }
@ -91,6 +95,7 @@ impl<'a> Chat<'a> {
imgs: &'a Imgs, imgs: &'a Imgs,
fonts: &'a Fonts, fonts: &'a Fonts,
localized_strings: &'a Localization, localized_strings: &'a Localization,
chat_size: Vec2<f64>,
) -> Self { ) -> Self {
Self { Self {
pulse, pulse,
@ -104,6 +109,7 @@ impl<'a> Chat<'a> {
global_state, global_state,
common: widget::CommonBuilder::default(), common: widget::CommonBuilder::default(),
history_max: 32, history_max: 32,
chat_size,
localized_strings, localized_strings,
} }
} }
@ -179,6 +185,7 @@ pub enum Event {
Focus(Id), Focus(Id),
ChangeChatTab(Option<usize>), ChangeChatTab(Option<usize>),
ShowChatTabSettings(usize), ShowChatTabSettings(usize),
ResizeChat(Vec2<f64>),
} }
impl<'a> Widget for Chat<'a> { impl<'a> Widget for Chat<'a> {
@ -232,6 +239,24 @@ impl<'a> Widget for Chat<'a> {
} }
}); });
let handle_chat_resize = |chat_widget, ui: &mut UiCell, events: &mut Vec<Event>| {
let dragged: Vec2<f64> = ui
.widget_input(chat_widget)
.drags()
.right()
.map(|drag| Vec2::<f64>::from(drag.delta_xy))
.sum::<Vec2<f64>>();
if !dragged.is_approx_zero() {
let size = self.chat_size + dragged;
let size = size.map3(MIN_DIMENSION, MAX_DIMENSION, |sz, min, max| {
sz.clamp(min, max)
});
events.push(Event::ResizeChat(size));
}
};
handle_chat_resize(state.ids.message_box, ui, &mut events);
// Maintain scrolling // // Maintain scrolling //
if !self.new_messages.is_empty() { if !self.new_messages.is_empty() {
for message in self.new_messages.iter() { for message in self.new_messages.iter() {
@ -390,22 +415,22 @@ impl<'a> Widget for Chat<'a> {
Dimension::Absolute(y) => y + 6.0, Dimension::Absolute(y) => y + 6.0,
_ => 0.0, _ => 0.0,
}; };
Rectangle::fill([CHAT_BOX_WIDTH, y]) Rectangle::fill([self.chat_size.x, y])
.rgba(0.0, 0.0, 0.0, chat_settings.chat_opacity + 0.1) .rgba(0.0, 0.0, 0.0, chat_settings.chat_opacity + 0.1)
.bottom_left_with_margins_on(ui.window, 10.0, 10.0) .bottom_left_with_margins_on(ui.window, 10.0, 10.0)
.w(CHAT_BOX_WIDTH) .w(self.chat_size.x)
.set(state.ids.chat_input_bg, ui); .set(state.ids.chat_input_bg, ui);
//border around focused chat window //border around focused chat window
let border_color = adjust_border_opacity(color, chat_settings.chat_opacity); let border_color = adjust_border_opacity(color, chat_settings.chat_opacity);
//top line //top line
Line::centred([0.0, 0.0], [CHAT_BOX_WIDTH, 0.0]) Line::centred([0.0, 0.0], [self.chat_size.x, 0.0])
.color(border_color) .color(border_color)
.thickness(CHAT_MARGIN_THICKNESS) .thickness(CHAT_MARGIN_THICKNESS)
.top_left_of(state.ids.chat_input_bg) .top_left_of(state.ids.chat_input_bg)
.set(state.ids.chat_input_border_up, ui); .set(state.ids.chat_input_border_up, ui);
//bottom line //bottom line
Line::centred([0.0, 0.0], [CHAT_BOX_WIDTH, 0.0]) Line::centred([0.0, 0.0], [self.chat_size.x, 0.0])
.color(border_color) .color(border_color)
.thickness(CHAT_MARGIN_THICKNESS) .thickness(CHAT_MARGIN_THICKNESS)
.bottom_left_of(state.ids.chat_input_bg) .bottom_left_of(state.ids.chat_input_bg)
@ -433,7 +458,7 @@ impl<'a> Widget for Chat<'a> {
} }
// Message box // Message box
Rectangle::fill([CHAT_BOX_WIDTH, CHAT_BOX_HEIGHT]) Rectangle::fill([self.chat_size.x, self.chat_size.y])
.rgba(0.0, 0.0, 0.0, chat_settings.chat_opacity) .rgba(0.0, 0.0, 0.0, chat_settings.chat_opacity)
.and(|r| { .and(|r| {
if input_focused { if input_focused {
@ -503,13 +528,13 @@ impl<'a> Widget for Chat<'a> {
.resize(n_badges, &mut ui.widget_id_generator()) .resize(n_badges, &mut ui.widget_id_generator())
}) })
} }
Rectangle::fill_with([CHAT_ICON_WIDTH, CHAT_BOX_HEIGHT], color::TRANSPARENT) Rectangle::fill_with([CHAT_ICON_WIDTH, self.chat_size.y], color::TRANSPARENT)
.top_left_with_margins_on(state.ids.message_box_bg, 0.0, 0.0) .top_left_with_margins_on(state.ids.message_box_bg, 0.0, 0.0)
.crop_kids() .crop_kids()
.set(state.ids.chat_icon_align, ui); .set(state.ids.chat_icon_align, ui);
let (mut items, _) = List::flow_down(messages.len() + 1) let (mut items, _) = List::flow_down(messages.len() + 1)
.top_left_with_margins_on(state.ids.message_box_bg, 0.0, CHAT_ICON_WIDTH) .top_left_with_margins_on(state.ids.message_box_bg, 0.0, CHAT_ICON_WIDTH)
.w_h(CHAT_BOX_WIDTH - CHAT_ICON_WIDTH, CHAT_BOX_HEIGHT) .w_h(self.chat_size.x - CHAT_ICON_WIDTH, self.chat_size.y)
.scroll_kids_vertically() .scroll_kids_vertically()
.set(state.ids.message_box, ui); .set(state.ids.message_box, ui);
@ -527,7 +552,7 @@ impl<'a> Widget for Chat<'a> {
let text = Text::new(text) let text = Text::new(text)
.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 - 17.0) .w(self.chat_size.x - 17.0)
.color(color) .color(color)
.line_spacing(2.0); .line_spacing(2.0);
// Add space between messages. // Add space between messages.
@ -561,7 +586,7 @@ impl<'a> Widget for Chat<'a> {
Text::new("") Text::new("")
.font_size(self.fonts.opensans.scale(6)) .font_size(self.fonts.opensans.scale(6))
.font_id(self.fonts.opensans.conrod_id) .font_id(self.fonts.opensans.conrod_id)
.w(CHAT_BOX_WIDTH), .w(self.chat_size.x),
ui, ui,
); );
}; };
@ -583,7 +608,7 @@ impl<'a> Widget for Chat<'a> {
let alpha = 1.0 - (time_since_hover / 1.5).powi(4); let alpha = 1.0 - (time_since_hover / 1.5).powi(4);
let shading = color::rgba(1.0, 0.82, 0.27, (chat_settings.chat_opacity + 0.1) * alpha); let shading = color::rgba(1.0, 0.82, 0.27, (chat_settings.chat_opacity + 0.1) * alpha);
Rectangle::fill([CHAT_BOX_WIDTH, CHAT_TAB_HEIGHT]) Rectangle::fill([self.chat_size.x, CHAT_TAB_HEIGHT])
.rgba(0.0, 0.0, 0.0, (chat_settings.chat_opacity + 0.1) * alpha) .rgba(0.0, 0.0, 0.0, (chat_settings.chat_opacity + 0.1) * alpha)
.up_from(state.ids.message_box_bg, 0.0) .up_from(state.ids.message_box_bg, 0.0)
.set(state.ids.chat_tab_align, ui); .set(state.ids.chat_tab_align, ui);
@ -614,7 +639,7 @@ impl<'a> Widget for Chat<'a> {
events.push(Event::ChangeChatTab(None)); events.push(Event::ChangeChatTab(None));
} }
let chat_tab_width = (CHAT_BOX_WIDTH - CHAT_TAB_ALL_WIDTH) / (MAX_CHAT_TABS as f64); let chat_tab_width = (self.chat_size.x - CHAT_TAB_ALL_WIDTH) / (MAX_CHAT_TABS as f64);
if state.ids.chat_tabs.len() < chat_tabs.len() { if state.ids.chat_tabs.len() < chat_tabs.len() {
state.update(|s| { state.update(|s| {

8
voxygen/src/hud/mod.rs
View File

@ -140,6 +140,8 @@ use std::{
use tracing::warn; use tracing::warn;
use vek::*; use vek::*;
use self::chat::{DEFAULT_CHAT_BOX_HEIGHT, DEFAULT_CHAT_BOX_WIDTH};
const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0); const TEXT_COLOR: Color = Color::Rgba(1.0, 1.0, 1.0, 1.0);
const TEXT_VELORITE: Color = Color::Rgba(0.0, 0.66, 0.66, 1.0); const TEXT_VELORITE: Color = Color::Rgba(0.0, 0.66, 0.66, 1.0);
const TEXT_BLUE_COLOR: Color = Color::Rgba(0.8, 0.9, 1.0, 1.0); const TEXT_BLUE_COLOR: Color = Color::Rgba(0.8, 0.9, 1.0, 1.0);
@ -1292,6 +1294,7 @@ pub struct Hud {
floaters: Floaters, floaters: Floaters,
voxel_minimap: VoxelMinimap, voxel_minimap: VoxelMinimap,
map_drag: Vec2<f64>, map_drag: Vec2<f64>,
chat_size: Vec2<f64>,
} }
impl Hud { impl Hud {
@ -1427,6 +1430,7 @@ impl Hud {
block_floaters: Vec::new(), block_floaters: Vec::new(),
}, },
map_drag: Vec2::zero(), map_drag: Vec2::zero(),
chat_size: Vec2::new(DEFAULT_CHAT_BOX_WIDTH, DEFAULT_CHAT_BOX_HEIGHT),
} }
} }
@ -3459,6 +3463,7 @@ impl Hud {
&self.imgs, &self.imgs,
&self.fonts, &self.fonts,
i18n, i18n,
self.chat_size,
) )
.and_then(self.force_chat_input.take(), |c, input| c.input(input)) .and_then(self.force_chat_input.take(), |c, input| c.input(input))
.and_then(self.tab_complete.take(), |c, input| { .and_then(self.tab_complete.take(), |c, input| {
@ -3488,6 +3493,9 @@ impl Hud {
self.show.settings_tab = SettingsTab::Chat; self.show.settings_tab = SettingsTab::Chat;
self.show.settings(true); self.show.settings(true);
}, },
chat::Event::ResizeChat(size) => {
self.chat_size = size;
},
} }
} }
} }