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

Make the minimap UI not exposed via checkbox yet (still configurable via settings.ron).

Browse Source
This commit is contained in:
Avi Weinstock 2021-05-16 17:01:46 -04:00
parent 9d60a7f533
commit e509a4207b
1 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -640,40 +640,44 @@ impl<'a> Widget for Map<'a> {
.graphics_for(state.ids.show_peaks_box) .graphics_for(state.ids.show_peaks_box)
.color(TEXT_COLOR) .color(TEXT_COLOR)
.set(state.ids.show_peaks_text, ui); .set(state.ids.show_peaks_text, ui);
// Voxel map // Voxel map (TODO: enable this once Pfau approves the final UI, and once
Image::new(self.imgs.mmap_poi_peak) // there's a non-placeholder graphic for the checkbox)
.down_from(state.ids.show_peaks_img, 10.0) const EXPOSE_VOXEL_MAP_TOGGLE_IN_UI: bool = false;
.w_h(20.0, 20.0) if EXPOSE_VOXEL_MAP_TOGGLE_IN_UI {
.set(state.ids.show_voxel_map_img, ui); Image::new(self.imgs.mmap_poi_peak)
if Button::image(if show_voxel_map { .down_from(state.ids.show_peaks_img, 10.0)
self.imgs.checkbox_checked .w_h(20.0, 20.0)
} else { .set(state.ids.show_voxel_map_img, ui);
self.imgs.checkbox if Button::image(if show_voxel_map {
}) self.imgs.checkbox_checked
.w_h(18.0, 18.0) } else {
.hover_image(if show_voxel_map { self.imgs.checkbox
self.imgs.checkbox_checked_mo })
} else { .w_h(18.0, 18.0)
self.imgs.checkbox_mo .hover_image(if show_voxel_map {
}) self.imgs.checkbox_checked_mo
.press_image(if show_voxel_map { } else {
self.imgs.checkbox_checked self.imgs.checkbox_mo
} else { })
self.imgs.checkbox_press .press_image(if show_voxel_map {
}) self.imgs.checkbox_checked
.right_from(state.ids.show_voxel_map_img, 10.0) } else {
.set(state.ids.show_voxel_map_box, ui) self.imgs.checkbox_press
.was_clicked() })
{ .right_from(state.ids.show_voxel_map_img, 10.0)
events.push(Event::SettingsChange(MapShowVoxelMap(!show_voxel_map))); .set(state.ids.show_voxel_map_box, ui)
.was_clicked()
{
events.push(Event::SettingsChange(MapShowVoxelMap(!show_voxel_map)));
}
Text::new(i18n.get("hud.map.voxel_map"))
.right_from(state.ids.show_voxel_map_box, 10.0)
.font_size(self.fonts.cyri.scale(14))
.font_id(self.fonts.cyri.conrod_id)
.graphics_for(state.ids.show_voxel_map_box)
.color(TEXT_COLOR)
.set(state.ids.show_voxel_map_text, ui);
} }
Text::new(i18n.get("hud.map.voxel_map"))
.right_from(state.ids.show_voxel_map_box, 10.0)
.font_size(self.fonts.cyri.scale(14))
.font_id(self.fonts.cyri.conrod_id)
.graphics_for(state.ids.show_voxel_map_box)
.color(TEXT_COLOR)
.set(state.ids.show_voxel_map_text, ui);
// Map icons // Map icons
if state.ids.mmap_poi_icons.len() < self.client.pois().len() { if state.ids.mmap_poi_icons.len() < self.client.pois().len() {
state.update(|state| { state.update(|state| {