Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 43 additions & 14 deletions src/BmsConfig/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ void ShowDetail(ParamItem item)
}
_suppressEvents = false;

FillDefaultButton.IsEnabled = entry.BmsValue != null && !isBool && !isEnum;
FillDefaultButton.IsEnabled = entry.BmsValue != null;
SaveFeedback.Text = "";
UpdateButtons();
}
Expand All @@ -562,10 +562,9 @@ void UpdateButtons()
{
ParamEntry entry = SelectedEntry;
bool hasTargets = SaveTargets.Any();
bool textValid = TextEditor.Visibility != Visibility.Visible || EditorError.Text.Length == 0;
bool inputValid = EditorInput != null && EditorError.Text.Length == 0;

ApplyButton.IsEnabled = entry != null && hasTargets && textValid;
ApplyButton.Visibility = TextEditor.Visibility; // bool & enum edits are applied immediately
ApplyButton.IsEnabled = entry != null && hasTargets && inputValid;
RevertButton.IsEnabled = entry != null && !entry.IsFeatureFlag && hasTargets
&& ((SaveToUser.IsChecked == true && entry.UserValue != null && !entry.UserValueFromLauncher)
|| (SaveToVr.IsChecked == true && entry.VrValue != null));
Expand Down Expand Up @@ -602,28 +601,58 @@ void OnTextEditorKeyDown(object sender, KeyEventArgs e)
}
}

void OnApplyClick(object sender, RoutedEventArgs e) { ApplyInput(TextEditor.Text); }
/// <summary>The new value in whichever editor is showing, or null if none is chosen yet.</summary>
string EditorInput
{
get
{
if (BoolEditor.Visibility == Visibility.Visible)
return BoolOn.IsChecked == true ? "1" : BoolOff.IsChecked == true ? "0" : null;
if (EnumEditor.Visibility == Visibility.Visible)
return EnumEditor.SelectedIndex >= 0 ? EnumEditor.SelectedIndex.ToString() : null;
return TextEditor.Text;
}
}

void OnBoolClick(object sender, RoutedEventArgs e)
void OnApplyClick(object sender, RoutedEventArgs e)
{
if (!_suppressEvents)
ApplyInput(BoolOn.IsChecked == true ? "1" : "0");
string input = EditorInput;
if (input != null)
ApplyInput(input);
}

void OnEnumChanged(object sender, SelectionChangedEventArgs e)
// ON/Off and enum choices are only staged here; they're saved by Apply & Save, like text values.
void OnBoolClick(object sender, RoutedEventArgs e) { OnEditorChoiceChanged(); }
void OnEnumChanged(object sender, SelectionChangedEventArgs e) { OnEditorChoiceChanged(); }

void OnEditorChoiceChanged()
{
if (_suppressEvents || EnumEditor.SelectedIndex < 0)
if (_suppressEvents)
return;

// Deferred: applying reloads the detail pane, which resets this combo's items.
string input = EnumEditor.SelectedIndex.ToString();
Dispatcher.BeginInvoke(new Action(() => ApplyInput(input)));
SaveFeedback.Text = "";
UpdateButtons();
}

void OnFillDefaultClick(object sender, RoutedEventArgs e)
{
ParamEntry entry = SelectedEntry;
if (entry != null && entry.BmsValue != null)
if (entry == null || entry.BmsValue == null)
return;

if (BoolEditor.Visibility == Visibility.Visible)
{
bool? b = ValueConverter.ParseCfgBool(entry.BmsValue);
BoolOn.IsChecked = b == true;
BoolOff.IsChecked = b == false;
OnEditorChoiceChanged();
}
else if (EnumEditor.Visibility == Visibility.Visible)
{
long? n = ValueConverter.ParseCfgInt(entry.BmsValue);
EnumEditor.SelectedIndex = (n.HasValue && n.Value >= 0 && n.Value < EnumEditor.Items.Count) ? (int)n.Value : -1;
}
else
{
TextEditor.Text = ValueConverter.ToEditText(entry.Type, entry.BmsValue);
TextEditor.Focus();
Expand Down
Loading