Skip to content

Enhance launcherTabsScroller scroll behavior #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 12, 2024
Merged

Enhance launcherTabsScroller scroll behavior #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5516b5
fix: Fixed ScrollViewer rebounding when scrolling to the right
gadfly3173 May 11, 2024
0fcef23
fix: add ScrollViewer event handler to disable scroll indicators base…
gadfly3173 May 11, 2024
ed680bf
ux: Use RepeatButton instead of Button to make ScrollIndicator suppor…
gadfly3173 May 11, 2024
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
6 changes: 3 additions & 3 deletions src/Resources/Styles.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,16 +230,16 @@
<Setter Property="Background" Value="Red"/>
</Style>

<Style Selector="Button.icon_button">
<Style Selector="Button.icon_button, RepeatButton.icon_button">
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="VerticalAlignment" Value="Center"/>
</Style>
<Style Selector="Button.icon_button /template/ ContentPresenter#PART_ContentPresenter">
<Style Selector="Button.icon_button /template/ ContentPresenter#PART_ContentPresenter, RepeatButton.icon_button /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Opacity" Value="0.8"/>
</Style>
<Style Selector="Button.icon_button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
<Style Selector="Button.icon_button:pointerover /template/ ContentPresenter#PART_ContentPresenter, RepeatButton.icon_button:pointerover /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Opacity" Value="1"/>
</Style>

Expand Down
11 changes: 6 additions & 5 deletions src/Views/Launcher.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,18 @@

<!-- Pages Tabs-->
<Grid x:Name="launcherTabsContainer" Grid.Column="1" Height="30" ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Bottom" SizeChanged="UpdateScrollIndicator">
<Button x:Name="leftScrollIndicator" Grid.Column="0" Classes="icon_button" Width="18" Height="30" Click="ScrollTabsLeft">
<RepeatButton x:Name="leftScrollIndicator" Grid.Column="0" Classes="icon_button" Width="18" Height="30" Click="ScrollTabsLeft">
<Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleLeft}"/>
</Button>
</RepeatButton>

<ScrollViewer Grid.Column="1"
x:Name="launcherTabsScroller"
HorizontalScrollBarVisibility="Hidden"
VerticalScrollBarVisibility="Disabled"
DoubleTapped="MaximizeOrRestoreWindow"
PointerPressed="BeginMoveWindow"
PointerWheelChanged="ScrollTabs">
PointerWheelChanged="ScrollTabs"
ScrollChanged="OnTabsScrollChanged">
<StackPanel x:Name="launcherTabsBar" Orientation="Horizontal" SizeChanged="UpdateScrollIndicator">
<ListBox Classes="launcher_page_tabbar"
ItemsSource="{Binding Pages}"
Expand Down Expand Up @@ -240,9 +241,9 @@
</StackPanel>
</ScrollViewer>

<Button x:Name="rightScrollIndicator" Grid.Column="2" Classes="icon_button" Width="18" Height="30" Click="ScrollTabsRight">
<RepeatButton x:Name="rightScrollIndicator" Grid.Column="2" Classes="icon_button" Width="18" Height="30" Click="ScrollTabsRight">
<Path Width="8" Height="14" Stretch="Fill" Data="{StaticResource Icons.TriangleRight}"/>
</Button>
</RepeatButton>
</Grid>

<!-- Caption Buttons (Windows/Linux)-->
Expand Down
11 changes: 10 additions & 1 deletion src/Views/Launcher.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ private void ScrollTabs(object sender, PointerWheelEventArgs e)
{
if (e.Delta.Y < 0)
launcherTabsScroller.LineRight();
else
else if (e.Delta.Y > 0)
launcherTabsScroller.LineLeft();
e.Handled = true;
}
Expand Down Expand Up @@ -265,6 +265,15 @@ private void UpdateScrollIndicator(object sender, SizeChangedEventArgs e)
e.Handled = true;
}

private void OnTabsScrollChanged(object sender, ScrollChangedEventArgs e)
{
if (sender is ScrollViewer scrollViewer)
{
leftScrollIndicator.IsEnabled = scrollViewer.Offset.X > 0;
rightScrollIndicator.IsEnabled = scrollViewer.Offset.X < scrollViewer.Extent.Width - scrollViewer.Viewport.Width;
}
}

private void SetupDragAndDrop(object sender, RoutedEventArgs e)
{
if (sender is Border border)
Expand Down