Mirrors
/
Zelda64Recomp
mirror of https://github.com/Mr-Wiseguy/Zelda64Recomp.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed kb/cont nav issues

This commit is contained in:
thecozies 2024-03-14 10:12:52 -05:00
parent bc6b112992
commit 86d805de8d
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/config_menu/controls.rml
View File

@ -7,8 +7,10 @@
<div class="config__header-left"> <div class="config__header-left">
<button <button
class="toggle" class="toggle"
id="cont_kb_toggle"
data-class-toggle--checked="input_device_is_keyboard" data-class-toggle--checked="input_device_is_keyboard"
onclick="toggle_input_device" onclick="toggle_input_device"
style="nav-down:#input_row_button_0_0"
> >
<div class="toggle__border" /> <div class="toggle__border" />
<div class="toggle__floater" /> <div class="toggle__floater" />
@ -21,6 +23,7 @@
<div> <div>
<button <button
class="button button--warning" class="button button--warning"
style="nav-down:#input_row_button_0_0"
> >
<div class="button__label">Reset to defaults</div> <div class="button__label">Reset to defaults</div>
</button> </button>
@ -33,7 +36,7 @@
<div class="input-config__mappings-wrapper"> <div class="input-config__mappings-wrapper">
<div <div
class="control-option" class="control-option"
id="input_row" data-attr-id="'input_row_' + i"
data-for="input_bindings, i : inputs.array" data-for="input_bindings, i : inputs.array"
data-event-mouseover="set_input_row_focus(i)" data-event-mouseover="set_input_row_focus(i)"
data-class-control-option--active="get_input_enum_name(i)==cur_input_row" data-class-control-option--active="get_input_enum_name(i)==cur_input_row"
@ -43,12 +46,14 @@
>{{get_input_name(i)}}</label> >{{get_input_name(i)}}</label>
<div class="control-option__bindings"> <div class="control-option__bindings">
<button <button
data-attr-id="'input_row_button_' + i + '_' + j"
data-event-blur="set_input_row_focus(-1)" data-event-blur="set_input_row_focus(-1)"
data-event-focus="set_input_row_focus(i)" data-event-focus="set_input_row_focus(i)"
data-for="cur_binding, j : input_bindings" data-for="cur_binding, j : input_bindings"
data-event-click="set_input_binding(i,j)" data-event-click="set_input_binding(i,j)"
class="prompt-font control-option__binding" class="prompt-font control-option__binding"
data-attr-bind-slot="j" data-attr-bind-slot="j"
data-attr-style="i == 0 ? 'nav-up:#cont_kb_toggle' : 'nav-up:auto'"
> >
<div class="control-option__binding-recording"> <div class="control-option__binding-recording">
<div class="control-option__binding-circle" /> <div class="control-option__binding-circle" />
@ -64,6 +69,7 @@
data-event-focus="set_input_row_focus(i)" data-event-focus="set_input_row_focus(i)"
data-event-click="clear_input_bindings(i)" data-event-click="clear_input_bindings(i)"
class="icon-button icon-button--danger" class="icon-button icon-button--danger"
data-attr-style="i == 0 ? 'nav-up:#cont_kb_toggle' : 'nav-up:auto'"
> >
<svg src="icons/Trash.svg" /> <svg src="icons/Trash.svg" />
</button> </button>

1
assets/config_menu/graphics.rml
View File

@ -79,6 +79,7 @@
data-attrif-disabled="!options_changed" data-attrif-disabled="!options_changed"
onclick="apply_options" onclick="apply_options"
id="apply_button" id="apply_button"
style="nav-up:#rr_original"
> >
<div class="button__label">Apply</div> <div class="button__label">Apply</div>
</button> </button>

2
assets/recomp.rcss
View File

File diff suppressed because one or more lines are too long

1
assets/scss/styles/components/Button.scss
View File

@ -23,6 +23,7 @@
.button { .button {
@extend %label-md; @extend %label-md;
@extend %nav-all;
@include create-button-variation($color-primary); @include create-button-variation($color-primary);
@include trans-colors; @include trans-colors;