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 'coffee-compiler/fix_wrong_highlight_in_interface_settings' into 'master'

Browse Source 
Fix wrong button highlighting in interface settings

See merge request veloren/veloren!4543
This commit is contained in:
Marcel 2024-07-31 16:05:21 +00:00
commit 409852591f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
voxygen/src/hud/settings_window/interface.rs
View File

@ -700,7 +700,6 @@ impl<'a> Widget for Interface<'a> {
.right_from(state.ids.show_shortcuts_button, 10.0) .right_from(state.ids.show_shortcuts_button, 10.0)
.font_size(self.fonts.cyri.scale(14)) .font_size(self.fonts.cyri.scale(14))
.font_id(self.fonts.cyri.conrod_id) .font_id(self.fonts.cyri.conrod_id)
.graphics_for(state.ids.show_shortcuts_button)
.color(TEXT_COLOR) .color(TEXT_COLOR)
.set(state.ids.show_shortcuts_text, ui); .set(state.ids.show_shortcuts_text, ui);
// Buff Position // Buff Position
@ -732,7 +731,7 @@ impl<'a> Widget for Interface<'a> {
.right_from(state.ids.buff_pos_bar_button, 10.0) .right_from(state.ids.buff_pos_bar_button, 10.0)
.font_size(self.fonts.cyri.scale(14)) .font_size(self.fonts.cyri.scale(14))
.font_id(self.fonts.cyri.conrod_id) .font_id(self.fonts.cyri.conrod_id)
.graphics_for(state.ids.show_shortcuts_button) .graphics_for(state.ids.buff_pos_bar_button)
.color(TEXT_COLOR) .color(TEXT_COLOR)
.set(state.ids.buff_pos_bar_text, ui); .set(state.ids.buff_pos_bar_text, ui);
// Buffs left from minimap // Buffs left from minimap
@ -759,7 +758,7 @@ impl<'a> Widget for Interface<'a> {
.right_from(state.ids.buff_pos_map_button, 10.0) .right_from(state.ids.buff_pos_map_button, 10.0)
.font_size(self.fonts.cyri.scale(14)) .font_size(self.fonts.cyri.scale(14))
.font_id(self.fonts.cyri.conrod_id) .font_id(self.fonts.cyri.conrod_id)
.graphics_for(state.ids.show_shortcuts_button) .graphics_for(state.ids.buff_pos_map_button)
.color(TEXT_COLOR) .color(TEXT_COLOR)
.set(state.ids.buff_pos_map_text, ui); .set(state.ids.buff_pos_map_text, ui);
// Slots text // Slots text