Skip to content

Commit 9eacadf

Browse files
FrayxRulezFrayxRulez
committed
Fix settings margins
1 parent 14bb749 commit 9eacadf

14 files changed

+78
-64
lines changed

‎Telegram/Controls/Cells/ProfileCell.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
Visibility="Collapsed"
3535
Width="36"
3636
Height="36"
37-
Margin="0,0,8,0"
37+
Margin="0,0,10,0"
3838
Grid.RowSpan="2"
3939
StrokeThickness="2"
4040
Stroke="{ThemeResource SystemControlBackgroundAccentBrush}" />
@@ -44,7 +44,7 @@
4444
IsEnabled="False"
4545
Width="36"
4646
Height="36"
47-
Margin="0,6,8,6"
47+
Margin="0,6,10,6"
4848
Grid.RowSpan="2">
4949
<controls:ProfilePicture x:Name="Photo"
5050
Size="36" />
@@ -54,7 +54,7 @@
5454
x:Load="False"
5555
Width="36"
5656
Height="36"
57-
Margin="0,0,8,0"
57+
Margin="0,0,10,0"
5858
Grid.RowSpan="2">
5959
<Border HorizontalAlignment="Right"
6060
VerticalAlignment="Bottom"

‎Telegram/Controls/Cells/ProfileCell.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,8 +1439,8 @@ private void ShowSkeleton()
14391439
var random = new Random();
14401440

14411441
shapes.Add(CanvasGeometry.CreateEllipse(null, borderLeft + 12 + 18, borderTop + 6 + 18, 18, 18));
1442-
shapes.Add(CanvasGeometry.CreateRoundedRectangle(null, borderLeft + 12 + 36 + 8, borderTop + 6, random.Next(80, maxWidth), 18, 4, 4));
1443-
shapes.Add(CanvasGeometry.CreateRoundedRectangle(null, borderLeft + 12 + 36 + 8, borderTop + 6 + 18 + 4, random.Next(80, maxWidth), 14, 4, 4));
1442+
shapes.Add(CanvasGeometry.CreateRoundedRectangle(null, borderLeft + 12 + 36 + 10, borderTop + 6, random.Next(80, maxWidth), 18, 4, 4));
1443+
shapes.Add(CanvasGeometry.CreateRoundedRectangle(null, borderLeft + 12 + 36 + 10, borderTop + 6 + 18 + 4, random.Next(80, maxWidth), 14, 4, 4));
14441444

14451445
var compositor = BootStrapper.Current.Compositor;
14461446

‎Telegram/Controls/Cells/SessionCell.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
UseLayoutRounding="False"
2323
VerticalAlignment="Top"
2424
CornerRadius="18"
25-
Margin="0,0,8,0"
25+
Margin="0,0,10,0"
2626
Width="36"
2727
Height="36"
2828
Grid.RowSpan="3">

‎Telegram/Controls/Cells/WebSessionCell.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<controls:ProfilePicture x:Name="Photo"
2222
VerticalAlignment="Top"
2323
Size="36"
24-
Margin="0,0,8,0"
24+
Margin="0,0,10,0"
2525
Grid.RowSpan="3" />
2626
<TextBlock x:Name="Domain"
2727
TextTrimming="CharacterEllipsis"

‎Telegram/Themes/CheckBox_themeresources.xaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
<Setter Property="BorderBrush"
2323
Value="{ThemeResource CardStrokeColorDefaultBrush}" />
2424
<Setter Property="Padding"
25-
Value="16,11,0,0" />
25+
Value="0,11,0,12" />
2626
<Setter Property="HorizontalAlignment"
2727
Value="Stretch" />
2828
<Setter Property="VerticalAlignment"
2929
Value="Center" />
3030
<Setter Property="HorizontalContentAlignment"
3131
Value="Left" />
3232
<Setter Property="VerticalContentAlignment"
33-
Value="Top" />
33+
Value="Center" />
3434
<Setter Property="FontFamily"
3535
Value="{ThemeResource ContentControlThemeFontFamily}" />
3636
<Setter Property="FontSize"
@@ -571,7 +571,7 @@
571571
<Grid x:Name="Chevron"
572572
Grid.Column="0"
573573
VerticalAlignment="Center"
574-
Margin="20,0,0,0"
574+
Margin="18,0,20,0"
575575
Height="{StaticResource CheckBoxSize}"
576576
Width="{StaticResource CheckBoxSize}">
577577
<Rectangle x:Name="NormalRectangle"
@@ -602,8 +602,8 @@
602602
ContentTransitions="{TemplateBinding ContentTransitions}"
603603
Content="{TemplateBinding Content}"
604604
Margin="{TemplateBinding Padding}"
605-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
606-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
605+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
606+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
607607
AutomationProperties.AccessibilityView="Raw"
608608
TextWrapping="Wrap" />
609609
</Grid>

‎Telegram/Themes/Generic.xaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5380,7 +5380,7 @@
53805380
</VisualStateManager.VisualStateGroups>
53815381
<Grid.ColumnDefinitions>
53825382
<ColumnDefinition Width="Auto"
5383-
MinWidth="12" />
5383+
MinWidth="16" />
53845384
<ColumnDefinition Width="Auto" />
53855385
<ColumnDefinition />
53865386
<ColumnDefinition Width="Auto" />
@@ -5391,13 +5391,14 @@
53915391
<RowDefinition Height="Auto" />
53925392
</Grid.RowDefinitions>
53935393
<Border x:Name="GlyphPresenter"
5394-
Width="56"
5394+
Width="24"
5395+
Height="24"
5396+
Margin="16,0,18,0"
53955397
Grid.RowSpan="2">
53965398
<TextBlock x:Name="GlyphIcon"
53975399
FontSize="25"
5398-
HorizontalAlignment="Left"
5400+
HorizontalAlignment="Center"
53995401
VerticalAlignment="Center"
5400-
Margin="15.5,0,0,0"
54015402
AutomationProperties.AccessibilityView="Raw"
54025403
Text="{TemplateBinding Glyph}"
54035404
FontFamily="{StaticResource SymbolThemeFontFamily}" />
@@ -5456,7 +5457,7 @@
54565457
</TransitionCollection>
54575458
</ContentControl.ContentTransitions>
54585459
<ContentControl.Clip>
5459-
<RectangleGeometry Rect="0,0,3600,44" />
5460+
<RectangleGeometry Rect="0,0,1000,48" />
54605461
</ContentControl.Clip>
54615462
</ContentControl>
54625463

‎Telegram/Themes/RadioButton_themeresources.xaml‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
<Setter Property="BorderBrush"
1717
Value="{ThemeResource CardStrokeColorDefaultBrush}" />
1818
<Setter Property="Padding"
19-
Value="16,6,0,0" />
19+
Value="0,11,0,12" />
2020
<Setter Property="HorizontalAlignment"
2121
Value="Stretch" />
2222
<Setter Property="VerticalAlignment"
2323
Value="Stretch" />
2424
<Setter Property="HorizontalContentAlignment"
2525
Value="Left" />
2626
<Setter Property="VerticalContentAlignment"
27-
Value="Top" />
27+
Value="Center" />
2828
<Setter Property="FontFamily"
2929
Value="{ThemeResource ContentControlThemeFontFamily}" />
3030
<Setter Property="FontSize"
@@ -46,8 +46,7 @@
4646
Background="{TemplateBinding Background}"
4747
BorderBrush="{TemplateBinding BorderBrush}"
4848
BorderThickness="{TemplateBinding BorderThickness}"
49-
CornerRadius="{TemplateBinding CornerRadius}"
50-
Padding="20,6,12,6">
49+
CornerRadius="{TemplateBinding CornerRadius}">
5150
<Grid.BackgroundTransition>
5251
<BrushTransition Duration="0:0:0.083" />
5352
</Grid.BackgroundTransition>
@@ -338,13 +337,15 @@
338337
</VisualStateManager.VisualStateGroups>
339338

340339
<Grid.ColumnDefinitions>
341-
<ColumnDefinition Width="20" />
342-
<ColumnDefinition Width="*" />
340+
<ColumnDefinition Width="Auto" />
341+
<ColumnDefinition />
343342
</Grid.ColumnDefinitions>
344343

345344
<Grid x:Name="Chevron"
346345
VerticalAlignment="Center"
347-
Height="20">
346+
Height="20"
347+
Width="20"
348+
Margin="18,0,20,0">
348349
<Ellipse x:Name="OuterEllipse"
349350
Width="20"
350351
Height="20"
@@ -387,8 +388,8 @@
387388
ContentTemplate="{TemplateBinding ContentTemplate}"
388389
Foreground="{TemplateBinding Foreground}"
389390
Margin="{TemplateBinding Padding}"
390-
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
391-
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
391+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
392+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
392393
Grid.Column="1"
393394
AutomationProperties.AccessibilityView="Raw"
394395
TextWrapping="Wrap" />
@@ -407,7 +408,7 @@
407408
<Setter Property="BorderBrush"
408409
Value="{ThemeResource CardStrokeColorDefaultBrush}" />
409410
<Setter Property="Padding"
410-
Value="16,6,0,0" />
411+
Value="0,11,0,12" />
411412
<Setter Property="HorizontalAlignment"
412413
Value="Stretch" />
413414
<Setter Property="VerticalAlignment"
@@ -435,8 +436,7 @@
435436
Background="{TemplateBinding Background}"
436437
BorderBrush="{TemplateBinding BorderBrush}"
437438
BorderThickness="{TemplateBinding BorderThickness}"
438-
CornerRadius="{TemplateBinding CornerRadius}"
439-
Padding="20,6,12,12">
439+
CornerRadius="{TemplateBinding CornerRadius}">
440440

441441
<VisualStateManager.VisualStateGroups>
442442
<VisualStateGroup x:Name="CommonStates">
@@ -725,16 +725,19 @@
725725
</VisualStateManager.VisualStateGroups>
726726

727727
<Grid.ColumnDefinitions>
728-
<ColumnDefinition Width="20" />
729-
<ColumnDefinition Width="*" />
728+
<ColumnDefinition Width="Auto" />
729+
<ColumnDefinition />
730730
</Grid.ColumnDefinitions>
731731
<Grid.RowDefinitions>
732732
<RowDefinition Height="Auto" />
733733
<RowDefinition Height="Auto" />
734734
</Grid.RowDefinitions>
735735

736736
<Grid VerticalAlignment="Center"
737-
Height="32">
737+
Width="20"
738+
Height="20"
739+
Margin="18,0,20,0"
740+
Grid.RowSpan="2">
738741
<Ellipse x:Name="OuterEllipse"
739742
Width="20"
740743
Height="20"
@@ -788,7 +791,7 @@
788791
FontFamily="{ThemeResource ContentControlThemeFontFamily}"
789792
Content="{TemplateBinding Tag}"
790793
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
791-
Padding="16,-6,12,0"
794+
Padding="0,-10,12,12"
792795
IsTabStop="False"
793796
Grid.Column="1"
794797
Grid.Row="1">

‎Telegram/Views/Business/BusinessPage.xaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<DataTemplate>
9393
<Grid>
9494
<Grid.ColumnDefinitions>
95-
<ColumnDefinition Width="56" />
95+
<ColumnDefinition Width="58" />
9696
<ColumnDefinition />
9797
<ColumnDefinition Width="Auto" />
9898
</Grid.ColumnDefinitions>
@@ -103,9 +103,10 @@
103103
<Border x:Name="IconPanel"
104104
HorizontalAlignment="Left"
105105
VerticalAlignment="Center"
106-
Margin="18,4,0,0"
106+
Margin="16,0,0,0"
107107
Padding="2"
108-
CornerRadius="4">
108+
CornerRadius="4"
109+
Grid.RowSpan="2">
109110
<TextBlock x:Name="Icon"
110111
FontSize="20"
111112
AutomationProperties.AccessibilityView="Raw"
@@ -120,9 +121,10 @@
120121
Margin="0,11,12,12"
121122
Grid.Column="1" />
122123
<TextBlock x:Name="Subtitle"
123-
FontSize="{ThemeResource ControlContentThemeFontSize}"
124-
FontFamily="12"
124+
FontSize="12"
125+
FontFamily="{ThemeResource ContentControlThemeFontFamily}"
125126
Foreground="{ThemeResource SystemControlDisabledChromeDisabledLowBrush}"
127+
TextWrapping="Wrap"
126128
Margin="0,-10,12,12"
127129
Grid.Column="1"
128130
Grid.Row="1" />

‎Telegram/Views/Folders/FoldersPage.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<DataTemplate>
4242
<Grid>
4343
<Grid.ColumnDefinitions>
44-
<ColumnDefinition Width="56" />
44+
<ColumnDefinition Width="58" />
4545
<ColumnDefinition />
4646
<ColumnDefinition Width="Auto" />
4747
</Grid.ColumnDefinitions>
@@ -52,7 +52,7 @@
5252
<TextBlock FontSize="20"
5353
HorizontalAlignment="Left"
5454
VerticalAlignment="Center"
55-
Margin="20,0,0,0"
55+
Margin="18,0,0,0"
5656
AutomationProperties.AccessibilityView="Raw"
5757
FontFamily="{StaticResource SymbolThemeFontFamily}"
5858
Grid.RowSpan="2" />
@@ -112,7 +112,7 @@
112112
<DataTemplate>
113113
<Grid>
114114
<Grid.ColumnDefinitions>
115-
<ColumnDefinition Width="56" />
115+
<ColumnDefinition Width="58" />
116116
<ColumnDefinition Width="Auto" />
117117
<ColumnDefinition />
118118
<ColumnDefinition Width="Auto" />
@@ -121,7 +121,7 @@
121121
<TextBlock FontSize="{StaticResource GlyphMediumFontSize}"
122122
HorizontalAlignment="Left"
123123
VerticalAlignment="Center"
124-
Margin="20,0,0,0"
124+
Margin="18,0,0,0"
125125
AutomationProperties.AccessibilityView="Raw"
126126
FontFamily="{StaticResource SymbolThemeFontFamily}" />
127127

0 commit comments

Comments
 (0)