Skip to content

Commit 3984954

Browse files
marticlimentmarticliment
committed
ListLayout simplification, less RAM usage
1 parent 658966e commit 3984954

1 file changed

Lines changed: 41 additions & 28 deletions

File tree

‎src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml‎

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,18 @@
4242

4343
<Grid
4444
Padding="12,3,8,3"
45-
ColumnSpacing="5"
45+
ColumnSpacing="4"
4646
Opacity="{x:Bind ListedOpacity, Mode=OneWay}">
4747
<Grid.RowDefinitions>
4848
<RowDefinition Height="30" />
4949
</Grid.RowDefinitions>
5050
<Grid.ColumnDefinitions>
5151
<ColumnDefinition Width="24" />
52-
<ColumnDefinition Width="24" />
53-
<ColumnDefinition Width="*" MinWidth="100" />
54-
<ColumnDefinition Width="24" />
55-
<ColumnDefinition Width="*" MinWidth="100" />
56-
<ColumnDefinition Width="24" />
57-
<ColumnDefinition Width="*" MaxWidth="125" />
58-
<ColumnDefinition Width="24" MaxWidth="{x:Bind NewVersionIconWidth}" />
59-
<ColumnDefinition Width="*" MaxWidth="{x:Bind NewVersionLabelWidth}" />
60-
<ColumnDefinition Width="24" />
52+
<ColumnDefinition Width="*" MinWidth="125" />
53+
<ColumnDefinition Width="*" MinWidth="125" />
6154
<ColumnDefinition Width="*" MaxWidth="150" />
55+
<ColumnDefinition Width="*" MaxWidth="{x:Bind NewVersionLabelWidth}" />
56+
<ColumnDefinition Width="*" MaxWidth="175" />
6257
</Grid.ColumnDefinitions>
6358
<CheckBox
6459
Grid.Row="0"
@@ -70,15 +65,20 @@
7065
<widgets:LocalIcon
7166
Grid.Row="0"
7267
Grid.Column="1"
68+
Width="24"
69+
HorizontalAlignment="Left"
7370
VerticalAlignment="Center"
7471
FontSize="24"
7572
FontWeight="ExtraLight"
7673
Icon="Package"
7774
ToolTipService.ToolTip="{x:Bind ListedNameTooltip, Mode=OneWay}"
7875
Visibility="{x:Bind ShowDefaultPackageIcon, Mode=OneWay}" />
76+
7977
<Image
8078
Grid.Row="0"
8179
Grid.Column="1"
80+
Width="24"
81+
HorizontalAlignment="Left"
8282
VerticalAlignment="Center"
8383
Source="{x:Bind MainIconSource, Mode=OneWay}"
8484
ToolTipService.ToolTip="{x:Bind ListedNameTooltip, Mode=OneWay}"
@@ -90,22 +90,23 @@
9090
Grid.Column="1"
9191
Width="20"
9292
Height="20"
93-
Margin="0,0,-4,-2"
94-
HorizontalAlignment="Right"
93+
Margin="8,0,-4,-2"
94+
HorizontalAlignment="Left"
9595
VerticalAlignment="Bottom"
9696
FontSize="20"
9797
FontWeight="ExtraLight"
9898
Foreground="{ThemeResource AccentAAFillColorTertiaryBrush}"
9999
Icon="{x:Bind AlternateIconId, Mode=OneWay}"
100100
ToolTipService.ToolTip="{x:Bind ListedNameTooltip, Mode=OneWay}"
101101
Visibility="{x:Bind AlternateIdIconVisible, Mode=OneWay}" />
102+
102103
<widgets:LocalIcon
103104
Grid.Row="0"
104105
Grid.Column="1"
105106
Width="20"
106107
Height="20"
107-
Margin="0,0,-4,-2"
108-
HorizontalAlignment="Right"
108+
Margin="8,0,-4,-2"
109+
HorizontalAlignment="Left"
109110
VerticalAlignment="Bottom"
110111
FontSize="20"
111112
FontWeight="ExtraLight"
@@ -115,75 +116,87 @@
115116

116117
<TextBlock
117118
Grid.Row="0"
118-
Grid.Column="2"
119+
Grid.Column="1"
120+
Margin="28,-2,0,0"
119121
VerticalAlignment="Center"
120-
FontFamily="Segoe UI Variable Text"
121122
FontSize="13"
122123
Text="{x:Bind Package.Name}"
123124
ToolTipService.ToolTip="{x:Bind ListedNameTooltip, Mode=OneWay}" />
125+
124126
<widgets:LocalIcon
125127
Grid.Row="0"
126-
Grid.Column="3"
128+
Grid.Column="2"
129+
HorizontalAlignment="Left"
127130
VerticalAlignment="Center"
128131
FontSize="24"
129132
FontWeight="ExtraLight"
130133
Icon="Id"
131134
ToolTipService.ToolTip="{x:Bind Package.Id}" />
135+
132136
<TextBlock
133137
Grid.Row="0"
134-
Grid.Column="4"
138+
Grid.Column="2"
139+
Margin="28,-2,0,0"
135140
VerticalAlignment="Center"
136-
FontFamily="Segoe UI Variable Text"
137141
FontSize="13"
138142
Text="{x:Bind Package.Id}"
139143
ToolTipService.ToolTip="{x:Bind Package.Id}" />
144+
140145
<widgets:LocalIcon
141146
Grid.Row="0"
142-
Grid.Column="5"
147+
Grid.Column="3"
148+
HorizontalAlignment="Left"
143149
VerticalAlignment="Center"
144150
FontSize="24"
145151
FontWeight="ExtraLight"
146152
Icon="version"
147153
ToolTipService.ToolTip="{x:Bind Package.VersionString}" />
154+
148155
<TextBlock
149156
Grid.Row="0"
150-
Grid.Column="6"
157+
Grid.Column="3"
158+
Margin="28,-2,0,0"
151159
VerticalAlignment="Center"
152-
FontFamily="Segoe UI Variable Text"
153160
FontSize="13"
154161
Text="{x:Bind Package.VersionString, Mode=OneWay}"
155162
ToolTipService.ToolTip="{x:Bind Package.VersionString}" />
163+
156164
<widgets:LocalIcon
157165
Grid.Row="0"
158-
Grid.Column="7"
166+
Grid.Column="4"
167+
HorizontalAlignment="Left"
159168
VerticalAlignment="Center"
160169
FontSize="24"
161170
FontWeight="ExtraLight"
162171
Icon="download"
163172
ToolTipService.ToolTip="{x:Bind Package.NewVersionString}"
164173
Visibility="{x:Bind Package.IsUpgradable}" />
174+
165175
<TextBlock
166176
Grid.Row="0"
167-
Grid.Column="8"
177+
Grid.Column="4"
178+
Margin="28,-2,0,0"
168179
VerticalAlignment="Center"
169-
FontFamily="Segoe UI Variable Text"
170180
FontSize="13"
171181
Text="{x:Bind Package.NewVersionString}"
172182
ToolTipService.ToolTip="{x:Bind Package.NewVersionString}"
173183
Visibility="{x:Bind Package.IsUpgradable}" />
184+
174185
<widgets:LocalIcon
175186
Grid.Row="0"
176-
Grid.Column="9"
187+
Grid.Column="5"
188+
HorizontalAlignment="Left"
177189
VerticalAlignment="Center"
178190
FontSize="24"
179191
FontWeight="ExtraLight"
180192
Icon="{x:Bind Package.Source.IconId}"
181193
ToolTipService.ToolTip="{x:Bind Package.Source.AsString_DisplayName}" />
194+
182195
<TextBlock
183196
Grid.Row="0"
184-
Grid.Column="10"
197+
Grid.Column="5"
198+
Margin="28,-2,0,0"
185199
VerticalAlignment="Center"
186-
FontFamily="Segoe UI Variable Text"
187200
FontSize="13"
188201
Text="{x:Bind Package.Source.AsString_DisplayName}"
189202
ToolTipService.ToolTip="{x:Bind Package.Source.AsString_DisplayName}" />

0 commit comments

Comments
 (0)