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

Avoid saving settings if maps are not updating

Browse Source 
Fixes #1193
This commit is contained in:
Zakru 2021-06-15 20:52:59 +03:00
parent ad92d4deb0
commit 52c965fb6d
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
voxygen/src/hud/map.rs
View File

@ -327,7 +327,9 @@ impl<'a> Widget for Map<'a> {
.sum(); .sum();
// Drag represents offset of view from the player_pos in chunk coords // Drag represents offset of view from the player_pos in chunk coords
let drag_new = drag + dragged / map_size / zoom * max_zoom; let drag_new = drag + dragged / map_size / zoom * max_zoom;
if drag_new != drag {
events.push(Event::SettingsChange(MapDrag(drag_new))); events.push(Event::SettingsChange(MapDrag(drag_new)));
}
let rect_src = position::Rect::from_xy_dim( let rect_src = position::Rect::from_xy_dim(
[ [
@ -392,10 +394,12 @@ impl<'a> Widget for Map<'a> {
.scrolls() .scrolls()
.map(|scroll| scroll.y) .map(|scroll| scroll.y)
.sum(); .sum();
if scrolled != 0.0 {
let new_zoom_lvl = (self.global_state.settings.interface.map_zoom let new_zoom_lvl = (self.global_state.settings.interface.map_zoom
* (scrolled * 0.05 * -1.0).exp2()) * (scrolled * 0.05 * -1.0).exp2())
.clamped(1.25, max_zoom / 64.0); .clamped(1.25, max_zoom / 64.0);
events.push(Event::SettingsChange(MapZoom(new_zoom_lvl as f64))); events.push(Event::SettingsChange(MapZoom(new_zoom_lvl as f64)));
}
// Icon settings // Icon settings
// Alignment // Alignment
Rectangle::fill_with([150.0, 200.0], color::TRANSPARENT) Rectangle::fill_with([150.0, 200.0], color::TRANSPARENT)

4
voxygen/src/hud/minimap.rs
View File

@ -514,6 +514,7 @@ impl<'a> Widget for MiniMap<'a> {
// Set the image dimensions here, rather than recomputing each time. // Set the image dimensions here, rather than recomputing each time.
zoom = min_zoom.max(zoom / ZOOM_FACTOR); zoom = min_zoom.max(zoom / ZOOM_FACTOR);
// set_image_dims(zoom); // set_image_dims(zoom);
events.push(Event::SettingsChange(MinimapZoom(zoom)));
} }
if Button::image(self.imgs.mmap_plus) if Button::image(self.imgs.mmap_plus)
.w_h(18.0 * SCALE, 18.0 * SCALE) .w_h(18.0 * SCALE, 18.0 * SCALE)
@ -528,6 +529,7 @@ impl<'a> Widget for MiniMap<'a> {
{ {
zoom = min_zoom.max(zoom * ZOOM_FACTOR); zoom = min_zoom.max(zoom * ZOOM_FACTOR);
// set_image_dims(zoom); // set_image_dims(zoom);
events.push(Event::SettingsChange(MinimapZoom(zoom)));
} }
// Always northfacing button // Always northfacing button
@ -555,8 +557,6 @@ impl<'a> Widget for MiniMap<'a> {
events.push(Event::SettingsChange(MinimapFaceNorth(!is_facing_north))); events.push(Event::SettingsChange(MinimapFaceNorth(!is_facing_north)));
} }
events.push(Event::SettingsChange(MinimapZoom(zoom)));
// Coordinates // Coordinates
let player_pos = self let player_pos = self
.client .client