Skip to content
This repository was archived by the owner on Feb 16, 2024. It is now read-only.

Commit cb79e77

Browse files
BlooymBlooym
committed
scaling and ui tweaks
1 parent 7267dac commit cb79e77

File tree

1 file changed

+46
-45
lines changed

1 file changed

+46
-45
lines changed

‎src/XIVLauncher2/MainWindow.axaml‎

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -19,58 +19,59 @@
1919
<ExperimentalAcrylicMaterial BackgroundSource="Digger" TintOpacity="1" TintColor="Black"
2020
MaterialOpacity="0.75" FallbackColor="DarkBlue" />
2121
</ExperimentalAcrylicBorder.Material>
22-
<Grid VerticalAlignment="Center" HorizontalAlignment="Center">
23-
<Grid.ColumnDefinitions>
24-
<ColumnDefinition Width="Auto" />
25-
<ColumnDefinition Width="Auto" />
26-
</Grid.ColumnDefinitions>
22+
<Viewbox>
23+
<Grid VerticalAlignment="Center" HorizontalAlignment="Center" ColumnDefinitions="Auto, Auto">
2724

28-
<!--- News and Links -->
29-
<StackPanel Grid.Column="0" Spacing="5">
30-
<!-- News Images -->
31-
<Image Source="/Assets/placeholder-news.png" />
25+
<!--- News and Links -->
26+
<StackPanel Grid.Column="0">
27+
<!-- News Images -->
28+
<Image Source="/Assets/placeholder-news.png" Stretch="UniformToFill" Width="640" Height="250" />
3229

33-
<!-- News Links -->
34-
<StackPanel Margin="0,20,0,0" Spacing="5">
35-
<TextBlock>News one</TextBlock>
36-
<TextBlock>News two</TextBlock>
37-
<TextBlock>News three</TextBlock>
38-
<TextBlock>News four</TextBlock>
39-
<TextBlock>News five</TextBlock>
30+
<!-- News Links -->
31+
<Border Background="#282828" CornerRadius="5" Margin="0,20,0,0">
32+
<ListBox MaxHeight="150" VirtualizationMode="None">
33+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
34+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
35+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
36+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
37+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
38+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
39+
</ListBox>
40+
</Border>
4041
</StackPanel>
41-
</StackPanel>
4242

43-
<!-- Login -->
44-
<Border
45-
Background="#282828"
46-
CornerRadius="5"
47-
Margin="20,0,0,0"
48-
Padding="10"
49-
Grid.Column="1">
50-
<StackPanel Width="250" Spacing="10" VerticalAlignment="Center">
51-
<!-- Placeholder logo text -->
52-
<TextBlock Text="XIVLauncher" FontSize="24" FontWeight="Bold" HorizontalAlignment="Center" />
43+
<!-- Login -->
44+
<Border
45+
Background="#282828"
46+
CornerRadius="5"
47+
Margin="20,0,0,0"
48+
Padding="10"
49+
Grid.Column="1">
50+
<StackPanel Width="250" Spacing="10" VerticalAlignment="Center">
51+
<!-- Placeholder logo text -->
52+
<TextBlock Text="XIVLauncher" FontSize="24" FontWeight="Bold" HorizontalAlignment="Center" />
5353

54-
<!-- Text boxes -->
55-
<TextBox Watermark="ID"></TextBox>
56-
<TextBox Watermark="Password" PasswordChar="*"></TextBox>
54+
<!-- Text boxes -->
55+
<TextBox Watermark="ID"></TextBox>
56+
<TextBox Watermark="Password" PasswordChar="*"></TextBox>
5757

58-
<!-- Checkboxes -->
59-
<StackPanel HorizontalAlignment="Center">
60-
<CheckBox>Log in automatically</CheckBox>
61-
<CheckBox>Use one time password</CheckBox>
62-
<CheckBox>Use Steam service account</CheckBox>
63-
</StackPanel>
58+
<!-- Checkboxes -->
59+
<StackPanel HorizontalAlignment="Center">
60+
<CheckBox>Log in automatically</CheckBox>
61+
<CheckBox>Use one time password</CheckBox>
62+
<CheckBox>Use Steam service account</CheckBox>
63+
</StackPanel>
6464

65-
<!-- Buttons -->
66-
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"
67-
Spacing="5">
68-
<Button i:Attached.Icon="fa-play" ToolTip.Tip="Play" Height="40" Width="40" FontSize="20" />
69-
<Button i:Attached.Icon="fa-user-group" ToolTip.Tip="Accounts" Height="40" Width="40" FontSize="20" />
70-
<Button i:Attached.Icon="fa-cog" ToolTip.Tip="Settings" Height="40" Width="40" FontSize="20" />
65+
<!-- Buttons -->
66+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"
67+
Spacing="5">
68+
<Button i:Attached.Icon="fa-play" ToolTip.Tip="Play" Height="40" Width="40" FontSize="20" Background="#1e88e5" />
69+
<Button i:Attached.Icon="fa-user-group" ToolTip.Tip="Accounts" Height="40" Width="40" FontSize="20" />
70+
<Button i:Attached.Icon="fa-cog" ToolTip.Tip="Settings" Height="40" Width="40" FontSize="20" />
71+
</StackPanel>
7172
</StackPanel>
72-
</StackPanel>
73-
</Border>
74-
</Grid>
73+
</Border>
74+
</Grid>
75+
</Viewbox>
7576
</ExperimentalAcrylicBorder>
7677
</Window>

0 commit comments

Comments
 (0)