gramps/LlamaCasty
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix UI polish: scrollbar deselect, web source inline buttons, countdown in Sources, volume click-to-position, meter decay"

Browse Source 
This reverts commit dc91c855ef.
This commit is contained in:
Llama Chile Shop
2026-08-17 17:59:43 -07:00
parent b7b015b12b
commit c7d4b3b6d9
6 changed files with 48 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow.xaml.cs
+3 -18
View File
@@ -83,11 +83,8 @@ public partial class MainWindow : Window
private void VolumeSlider_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
if (sender is Slider slider && ClickIsOnTrackBackground(slider, e))
{
if (sender is Slider slider)
SetSliderValueFromClick(slider, e);
e.Handled = true;
}
if (sender is FrameworkElement { DataContext: MainViewModel vm })
vm.SetVolumeAdjusting(true);
}
@@ -106,11 +103,8 @@ public partial class MainWindow : Window
private void GameVolumeSlider_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
if (sender is Slider slider && ClickIsOnTrackBackground(slider, e))
{
if (sender is Slider slider)
SetSliderValueFromClick(slider, e);
e.Handled = true;
}
if (sender is FrameworkElement { DataContext: MainViewModel vm })
vm.SetGameVolumeAdjusting(true);
}
@@ -127,15 +121,6 @@ public partial class MainWindow : Window
vm.SetGameVolumeAdjusting(false);
}
private static bool ClickIsOnTrackBackground(Slider slider, MouseButtonEventArgs e)
{
var track = slider.Template.FindName("PART_Track", slider) as System.Windows.Controls.Primitives.Track;
if (track == null) return false;
if (track.Thumb != null && IsDescendantOf(e.OriginalSource as DependencyObject, track.Thumb))
return false;
return true;
}
private static void SetSliderValueFromClick(Slider slider, MouseButtonEventArgs e)
{
var track = slider.Template.FindName("PART_Track", slider) as System.Windows.Controls.Primitives.Track;
@@ -224,7 +209,7 @@ public partial class MainWindow : Window
if (e.OriginalSource is not DependencyObject original) return;
if (IsDescendantOf(original, PreviewGrid)) return;
if (IsDescendantOf(original, SourceList)) return;
if (IsDescendantOf(original, ElementsScrollViewer)) return;
if (IsDescendantOf(original, ElementsPanel)) return;
_viewModel.SelectedElement = null;
}