NebulaTeam/NebulaLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fix: transparent popup

Browse Source
This commit is contained in:
Cinka
2025-01-21 20:44:36 +03:00
parent 86e0536f0f
commit 3af99d40a1
4 changed files with 74 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Nebula.Launcher/Assets/Style.axaml
View File

@@ -4,29 +4,32 @@
</Style> </Style>
<Style Selector="Border"> <Style Selector="Border">
<Setter Property="BorderBrush" Value="#343334" /> <Setter Property="BorderBrush" Value="#343334" />
<Setter Property="Background" Value="{StaticResource NoneBackground}" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="BoxShadow" Value="0 0 10 0 #222222" /> <Setter Property="BoxShadow" Value="0 0 2 2 #222222" />
</Style> </Style>
<Style Selector="Label"> <Style Selector="Label">
<Setter Property="Foreground" Value="#f7f7ff" /> <Setter Property="Foreground" Value="#f7f7ff" />
</Style> </Style>
<Style Selector="ItemsControl"> <Style Selector="ItemsControl">
<Setter Property="Background" Value="{StaticResource NoneBackground}" /> <Setter Property="Background" Value="Transparent" />
</Style> </Style>
<Style Selector="Button"> <Style Selector="Button">
<Setter Property="BorderBrush" Value="#343334" /> <Setter Property="BorderBrush" Value="#343334" />
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="Padding" Value="5" /> <Setter Property="Padding" Value="5" />
<Setter Property="CornerRadius" Value="10" /> <Setter Property="CornerRadius" Value="10" />
<Setter Property="Background" Value="{StaticResource NoneBackground}" /> <Setter Property="Background" Value="Transparent" />
</Style> </Style>
<Style Selector="Button:pressed"> <Style Selector="Button:pressed">
<Setter Property="Background" Value="{StaticResource NoneBackground}" /> <Setter Property="RenderTransform" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0,0,0,2" />
<Setter Property="Background" Value="Transparent" />
</Style> </Style>
<Style Selector="Button:pointerover"> <Style Selector="Button:pointerover">
<Setter Property="RenderTransform" Value="{x:Null}" />
<Setter Property="BorderThickness" Value="0,0,0,2" /> <Setter Property="BorderThickness" Value="0,0,0,2" />
</Style> </Style>
@@ -34,7 +37,7 @@
<Setter Property="CornerRadius" Value="0,8,8,0" /> <Setter Property="CornerRadius" Value="0,8,8,0" />
<Setter Property="Margin" Value="0,0,0,5" /> <Setter Property="Margin" Value="0,0,0,5" />
<Setter Property="Padding" Value="8" /> <Setter Property="Padding" Value="8" />
<Setter Property="Background" Value="{StaticResource NoneBackground}" /> <Setter Property="Background" Value="Transparent" />
</Style> </Style>
<Style Selector="Button.ViewSelectButton:pressed"> <Style Selector="Button.ViewSelectButton:pressed">
@@ -52,18 +55,18 @@
<Setter Property="CornerRadius" Value="0,8,8,0" /> <Setter Property="CornerRadius" Value="0,8,8,0" />
<Setter Property="Margin" Value="0,0,0,5" /> <Setter Property="Margin" Value="0,0,0,5" />
<Setter Property="Padding" Value="8" /> <Setter Property="Padding" Value="8" />
<Setter Property="Background" Value="{StaticResource NoneBackground}" /> <Setter Property="Background" Value="Transparent" />
</Style> </Style>
<Style Selector="ListBox.AccountSelector &gt; ListBoxItem"> <Style Selector="ListBox.AccountSelector &gt; ListBoxItem">
<Setter Property="CornerRadius" Value="0" /> <Setter Property="CornerRadius" Value="0" />
<Setter Property="Margin" Value="0,0,0,0" /> <Setter Property="Margin" Value="0,0,0,0" />
<Setter Property="Padding" Value="0" /> <Setter Property="Padding" Value="0" />
<Setter Property="Background" Value="{StaticResource NoneBackground}" /> <Setter Property="Background" Value="Transparent" />
<Setter Property="Focusable" Value="False" /> <Setter Property="Focusable" Value="False" />
</Style> </Style>
<Style Selector="TextBox"> <Style Selector="TextBox">
<Setter Property="Background" Value="{StaticResource NoneBackground}" /> <Setter Property="Background" Value="Transparent" />
</Style> </Style>
</Styles> </Styles>

2
Nebula.Launcher/Views/MainView.axaml
View File

@@ -105,7 +105,7 @@
<Panel IsVisible="{Binding Popup}"> <Panel IsVisible="{Binding Popup}">
<Border Background="#111" Opacity="50" /> <Border Background="#111" Opacity="50" />
<Border CornerRadius="10" Margin="40"> <Border CornerRadius="10" Margin="40" Background="{StaticResource DefaultBackground}">
<Grid RowDefinitions="35,*,20"> <Grid RowDefinitions="35,*,20">
<Border <Border
BorderThickness="0,0,0,2" BorderThickness="0,0,0,2"

51
Nebula.Launcher/Views/Pages/ServerListView.axaml
View File

@@ -16,7 +16,7 @@
<Grid <Grid
ColumnDefinitions="*" ColumnDefinitions="*"
Margin="8,0,8,5" Margin="0"
RowDefinitions="*,40"> RowDefinitions="*,40">
<ScrollViewer Margin="0,0,0,10" Padding="0,0,10,0" Grid.RowSpan="2"> <ScrollViewer Margin="0,0,0,10" Padding="0,0,10,0" Grid.RowSpan="2">
<ItemsControl <ItemsControl
@@ -25,31 +25,30 @@
Padding="0"> Padding="0">
</ItemsControl> </ItemsControl>
</ScrollViewer> </ScrollViewer>
<Border <Border Grid.Row="1" Background="{StaticResource DefaultBackground}" BoxShadow="none">
BorderThickness="2,2,2,0"
CornerRadius="10"
Grid.Row="1">
<Grid ColumnDefinitions="*,40,40" RowDefinitions="*" Margin="5,0,0,0">
<TextBox
Margin="0"
Text="{Binding SearchText}"
TextChanged="TextBox_OnTextChanged"
VerticalAlignment="Center"
Watermark="Server name..." />
<Button
Command="{Binding FilterRequired}"
Grid.Column="1"
Padding="10">
<Svg Path="/Assets/svg/filter.svg"></Svg>
</Button>
<Button
Command="{Binding UpdateRequired}"
Grid.Column="2"
Padding="10">
<Svg Path="/Assets/svg/refresh.svg"></Svg>
</Button>
</Grid>
</Border> </Border>
<Grid Grid.Row="1" ColumnDefinitions="*,40,40" RowDefinitions="*" Margin="5,0,0,0">
<TextBox
Margin="0"
Text="{Binding SearchText}"
TextChanged="TextBox_OnTextChanged"
VerticalAlignment="Center"
Watermark="Server name..." />
<Button
Command="{Binding FilterRequired}"
Grid.Column="1"
Padding="10">
<Svg Path="/Assets/svg/filter.svg"></Svg>
</Button>
<Button
Command="{Binding UpdateRequired}"
Grid.Column="2"
Padding="10">
<Svg Path="/Assets/svg/refresh.svg"></Svg>
</Button>
</Grid>
</Grid> </Grid>
</UserControl> </UserControl>

82
Nebula.Launcher/Views/ServerEntryView.axaml
View File

@@ -18,44 +18,38 @@
<Border <Border
Background="#00000000" Background="#00000000"
BorderThickness="0,0,0,0" BorderThickness="2,1,0,1"
BoxShadow="0 0 10 0 #222222"
CornerRadius="10" CornerRadius="10"
Margin="0,5,0,5"> Margin="5">
<Grid ColumnDefinitions="30,*,80,50" RowDefinitions="35,*,*"> <Grid ColumnDefinitions="*,80,50" RowDefinitions="35,*,*">
<Border <Border
Background="#00000000" Background="#00000000"
BorderThickness="0,0,0,2" BorderThickness="0,0,0,2"
CornerRadius="10" CornerRadius="10"
Grid.Column="1" Grid.Column="0"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Grid.Row="0" Grid.Row="0"
IsVisible="{Binding ExpandInfo}" /> IsVisible="{Binding ExpandInfo}" />
<Button <Button
Background="#00000000" Background="#00000000"
BorderThickness="2,0,0,0"
Command="{Binding ExpandInfoRequired}" Command="{Binding ExpandInfoRequired}"
CornerRadius="10,0,0,10"
Grid.Column="0" Grid.Column="0"
Grid.Row="0" Grid.Row="0"
Grid.RowSpan="3" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
VerticalAlignment="Stretch"> <ScrollViewer
<Label Margin="5,0,5,0" VerticalAlignment="Bottom">i</Label> HorizontalScrollBarVisibility="Hidden"
Margin="10,0,0,0"
VerticalScrollBarVisibility="Disabled"
x:Name="AutoScrollViewer">
<Label VerticalAlignment="Center">
<TextBlock Text="{Binding ServerHubInfo.StatusData.Name}" />
</Label>
</ScrollViewer>
</Button> </Button>
<ScrollViewer
Grid.Column="1"
Grid.Row="0"
HorizontalScrollBarVisibility="Hidden"
Margin="10,0,0,0"
VerticalScrollBarVisibility="Disabled"
x:Name="AutoScrollViewer">
<Label VerticalAlignment="Center">
<TextBlock Text="{Binding ServerHubInfo.StatusData.Name}" />
</Label>
</ScrollViewer>
<StackPanel <StackPanel
Grid.Column="2" Grid.Column="1"
Grid.Row="0" Grid.Row="0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Orientation="Horizontal" Orientation="Horizontal"
@@ -71,7 +65,7 @@
<Panel <Panel
Grid.Column="3" Grid.Column="2"
Grid.Row="0" Grid.Row="0"
Margin="5,0,0,0"> Margin="5,0,0,0">
<Button <Button
@@ -92,29 +86,25 @@
</Button> </Button>
</Grid> </Grid>
</Panel> </Panel>
<Border <Label FontSize="12" Grid.Column="0" HorizontalAlignment="Left"
Background="#00000000" Grid.ColumnSpan="2"
BorderThickness="0,0,0,0" Grid.Row="1"
Grid.Column="1" IsVisible="{Binding ExpandInfo}"
Grid.ColumnSpan="3" Margin="15">
Grid.Row="1" <TextBlock Text="{Binding Description}" TextWrapping="Wrap" />
IsVisible="{Binding ExpandInfo}" </Label>
Margin="5">
<Label FontSize="12">
<TextBlock Text="{Binding Description}" TextWrapping="Wrap" />
</Label>
</Border>
<Border <Border
Background="#00000000" Background="#00000000"
BorderThickness="0,2,0,0" BorderThickness="0,2,0,0"
CornerRadius="10" CornerRadius="10"
Grid.Column="1" Grid.Column="0"
Grid.ColumnSpan="3" Grid.ColumnSpan="2"
Grid.Row="2" Grid.Row="2"
IsVisible="{Binding ExpandInfo}" IsVisible="{Binding ExpandInfo}"
Margin="5,15,15,5"> Margin="5,15,15,5">
<StackPanel Margin="5" Spacing="4"> <StackPanel Margin="5" Spacing="5">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Label FontSize="10" VerticalAlignment="Center">Tags:</Label> <Label FontSize="10" VerticalAlignment="Center">Tags:</Label>
<ItemsControl ItemsSource="{Binding Tags}"> <ItemsControl ItemsSource="{Binding Tags}">
@@ -134,22 +124,22 @@
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel <StackPanel Margin="5"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Orientation="Horizontal" Orientation="Horizontal"
VerticalAlignment="Center" /> VerticalAlignment="Center" Spacing="8"/>
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ItemsControl.ItemsPanel> </ItemsControl.ItemsPanel>
</ItemsControl> </ItemsControl>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal" >
<Label FontSize="10" VerticalAlignment="Center">Map:</Label> <Label FontSize="10" VerticalAlignment="Center">Map:</Label>
<Border <Border
Background="#121212" Background="#121212"
CornerRadius="8" CornerRadius="8"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Margin="1,1,1,1" Margin="5"
VerticalAlignment="Center"> VerticalAlignment="Center">
<Label FontSize="10" Margin="5,0,5,0"> <Label FontSize="10" Margin="5,0,5,0">
<TextBlock Text="{Binding ServerHubInfo.StatusData.Map}" /> <TextBlock Text="{Binding ServerHubInfo.StatusData.Map}" />
@@ -163,7 +153,7 @@
Background="#121212" Background="#121212"
CornerRadius="8" CornerRadius="8"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Margin="1,1,1,1" Margin="5"
VerticalAlignment="Center"> VerticalAlignment="Center">
<Label FontSize="10" Margin="5,0,5,0"> <Label FontSize="10" Margin="5,0,5,0">
<TextBlock Text="{Binding ServerHubInfo.StatusData.Preset}" /> <TextBlock Text="{Binding ServerHubInfo.StatusData.Preset}" />
@@ -173,7 +163,7 @@
</StackPanel> </StackPanel>
</Border> </Border>
<StackPanel <StackPanel
Grid.Column="3" Grid.Column="2"
Grid.Row="1" Grid.Row="1"
IsVisible="{Binding ExpandInfo}" IsVisible="{Binding ExpandInfo}"
Margin="5,5,0,0" Margin="5,5,0,0"