michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix: dragging the border to resize the window looks weird on Linux (#177)

Browse source
This commit is contained in:
leo 2024-06-13 15:25:04 +08:00
parent d85f7ffe1b
commit d9e17b96f2
No known key found for this signature in database
GPG key ID: B528468E49CD0E58
2 changed files with 68 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

130
src/Resources/Styles.axaml
View file

@ -40,21 +40,83 @@
<Style Selector="Window.custom_window_frame"> <Style Selector="Window.custom_window_frame">
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderThickness" Value="0"/> <Setter Property="BorderThickness" Value="0"/>
<Setter Property="ExtendClientAreaChromeHints" Value="Default"/>
<Setter Property="ExtendClientAreaToDecorationsHint" Value="False"/>
<Setter Property="SystemDecorations" Value="None"/> <Setter Property="SystemDecorations" Value="None"/>
<Setter Property="Padding" Value="12"/> <Setter Property="Padding" Value="12"/>
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Grid> <Grid>
<Border x:Name="PART_BorderTopLeft"
Classes="resize_border"
Width="12" Height="12"
Background="Transparent"
HorizontalAlignment="Left" VerticalAlignment="Top"
Cursor="TopLeftCorner"
Tag="{x:Static WindowEdge.NorthWest}"/>
<Border x:Name="PART_BorderTop"
Classes="resize_border"
Height="12" Margin="12,0"
Background="Transparent"
HorizontalAlignment="Stretch" VerticalAlignment="Top"
Cursor="TopSide"
Tag="{x:Static WindowEdge.North}"/>
<Border x:Name="PART_BorderTopRight"
Classes="resize_border"
Width="12" Height="12"
Background="Transparent"
HorizontalAlignment="Right" VerticalAlignment="Top"
Cursor="TopRightCorner"
Tag="{x:Static WindowEdge.NorthEast}"/>
<Border x:Name="PART_BorderLeft"
Classes="resize_border"
Width="12" Margin="0,12"
Background="Transparent"
HorizontalAlignment="Left" VerticalAlignment="Stretch"
Cursor="LeftSide"
Tag="{x:Static WindowEdge.West}"/>
<Border x:Name="PART_BorderRight"
Classes="resize_border"
Width="12" Margin="0,12"
Background="Transparent"
HorizontalAlignment="Right" VerticalAlignment="Stretch"
Cursor="RightSide"
Tag="{x:Static WindowEdge.East}"/>
<Border x:Name="PART_BorderBottomLeft"
Classes="resize_border"
Width="12" Height="12"
Background="Transparent"
HorizontalAlignment="Left" VerticalAlignment="Bottom"
Cursor="BottomLeftCorner"
Tag="{x:Static WindowEdge.SouthWest}"/>
<Border x:Name="PART_BorderBottom"
Classes="resize_border"
Height="12" Margin="12,0"
Background="Transparent"
HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
Cursor="BottomSide"
Tag="{x:Static WindowEdge.South}"/>
<Border x:Name="PART_BorderBottomRight"
Classes="resize_border"
Width="12" Height="12"
Background="Transparent"
HorizontalAlignment="Right" VerticalAlignment="Bottom"
Cursor="BottomRightCorner"
Tag="{x:Static WindowEdge.SouthEast}"/>
<Border x:Name="PART_ContentRoot" <Border x:Name="PART_ContentRoot"
Background="{DynamicResource Brush.Window}" Background="{DynamicResource Brush.Window}"
BorderBrush="{DynamicResource Brush.Border0}" BorderBrush="{DynamicResource Brush.Border0}"
BorderThickness="1" BorderThickness="1"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
CornerRadius="8" CornerRadius="8"
Effect="drop-shadow(0 0 12 #90000000)" Effect="drop-shadow(0 0 12 #A0000000)"
ClipToBounds="True"> ClipToBounds="True">
<VisualLayerManager> <VisualLayerManager>
<ContentPresenter Name="PART_ContentPresenter" <ContentPresenter Name="PART_ContentPresenter"
@ -64,64 +126,6 @@
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/> VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
</VisualLayerManager> </VisualLayerManager>
</Border> </Border>
<Grid x:Name="PART_ResizeBorderContainer" Margin="{TemplateBinding Padding}" IsHitTestVisible="True">
<Border x:Name="PART_BorderTopLeft"
Width="4" Height="4"
Background="Transparent"
HorizontalAlignment="Left" VerticalAlignment="Top"
Cursor="TopLeftCorner"
Tag="{x:Static WindowEdge.NorthWest}"/>
<Border x:Name="PART_BorderTop"
Height="4" Margin="4,0"
Background="Transparent"
HorizontalAlignment="Stretch" VerticalAlignment="Top"
Cursor="TopSide"
Tag="{x:Static WindowEdge.North}"/>
<Border x:Name="PART_BorderTopRight"
Width="4" Height="4"
Background="Transparent"
HorizontalAlignment="Right" VerticalAlignment="Top"
Cursor="TopRightCorner"
Tag="{x:Static WindowEdge.NorthEast}"/>
<Border x:Name="PART_BorderLeft"
Width="4" Margin="0,4"
Background="Transparent"
HorizontalAlignment="Left" VerticalAlignment="Stretch"
Cursor="LeftSide"
Tag="{x:Static WindowEdge.West}"/>
<Border x:Name="PART_BorderRight"
Width="4" Margin="0,4"
Background="Transparent"
HorizontalAlignment="Right" VerticalAlignment="Stretch"
Cursor="RightSide"
Tag="{x:Static WindowEdge.East}"/>
<Border x:Name="PART_BorderBottomLeft"
Width="4" Height="4"
Background="Transparent"
HorizontalAlignment="Left" VerticalAlignment="Bottom"
Cursor="BottomLeftCorner"
Tag="{x:Static WindowEdge.SouthWest}"/>
<Border x:Name="PART_BorderBottom"
Height="4" Margin="4,0"
Background="Transparent"
HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
Cursor="BottomSide"
Tag="{x:Static WindowEdge.South}"/>
<Border x:Name="PART_BorderBottomRight"
Width="4" Height="4"
Background="Transparent"
HorizontalAlignment="Right" VerticalAlignment="Bottom"
Cursor="BottomRightCorner"
Tag="{x:Static WindowEdge.SouthEast}"/>
</Grid>
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
@ -135,12 +139,12 @@
<Setter Property="BorderThickness" Value="0"/> <Setter Property="BorderThickness" Value="0"/>
</Style> </Style>
<Style Selector="Window.custom_window_frame[WindowState=Maximized] /template/ Grid#PART_ResizeBorderContainer"> <Style Selector="Window.custom_window_frame[WindowState=Maximized] /template/ Border.resize_border">
<Setter Property="IsVisible" Value="False"/> <Setter Property="IsVisible" Value="False"/>
<Setter Property="IsHitTestVisible" Value="False"/> <Setter Property="IsHitTestVisible" Value="False"/>
</Style> </Style>
<Style Selector="Window.custom_window_frame[CanResize=False] /template/ Grid#PART_ResizeBorderContainer"> <Style Selector="Window.custom_window_frame[CanResize=False] /template/ Border.resize_border">
<Setter Property="IsVisible" Value="False"/> <Setter Property="IsVisible" Value="False"/>
<Setter Property="IsHitTestVisible" Value="False"/> <Setter Property="IsHitTestVisible" Value="False"/>
</Style> </Style>

2
src/Views/ChromelessWindow.cs
View file

@ -49,7 +49,7 @@ namespace SourceGit.Views
private void OnWindowBorderPointerPressed(object sender, PointerPressedEventArgs e) private void OnWindowBorderPointerPressed(object sender, PointerPressedEventArgs e)
{ {
if (sender is Border border && border.Tag is WindowEdge edge) if (sender is Border border && border.Tag is WindowEdge edge && CanResize)
BeginResizeDrag(edge, e); BeginResizeDrag(edge, e);
} }
} }