Skip to content

Commit b5eb464

Browse files
Prep Document for new Segmented Orientation property
Tested with bits from CommunityToolkit/Windows#747 (needs VSM prop adds still missing from this commit)
1 parent 4ea9a9e commit b5eb464

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

XamlStudio/Views/Document.Design.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public partial class Document :
2626
{
2727
private DesignerMode _designerMode = DesignerMode.View;
2828

29-
private void Segmented_SelectionChanged(object sender, SelectionChangedEventArgs e)
29+
private void DesignerModeSelector_SelectionChanged(object sender, SelectionChangedEventArgs e)
3030
{
3131
RemoveAdorner();
3232

XamlStudio/Views/Document.xaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,15 @@
6060
<Setter Target="SplitterBar.(Grid.RowSpan)" Value="3" />
6161
<Setter Target="SplitterBar.(Grid.ColumnSpan)" Value="1" />
6262
<Setter Target="SplitterBar.ResizeDirection" Value="Columns" />
63+
<!-- Workaround for https://github.com/CommunityToolkit/Windows/issues/748 -->
64+
<Setter Target="SplitterBar.Orientation" Value="Vertical" />
6365

6466
<Setter Target="SplitterCommandBarLeft.(Grid.Row)" Value="0" />
6567
<Setter Target="SplitterCommandBarLeft.(Grid.Column)" Value="1" />
6668
<Setter Target="SplitterCommandBarLeft.(Grid.RowSpan)" Value="3" />
6769
<Setter Target="SplitterCommandBarLeft.(Grid.ColumnSpan)" Value="1" />
6870
<Setter Target="SplitterCommandBarLeft.Orientation" Value="Vertical" />
69-
<Setter Target="SplitterCommandBarLeft.Margin" Value="0,0,0,200" />
71+
<Setter Target="SplitterCommandBarLeft.Margin" Value="0,0,0,260" />
7072

7173
<Setter Target="SplitterCommandBarRight.(Grid.Row)" Value="0" />
7274
<Setter Target="SplitterCommandBarRight.(Grid.Column)" Value="1" />
@@ -107,13 +109,15 @@
107109
<Setter Target="SplitterBar.(Grid.RowSpan)" Value="3" />
108110
<Setter Target="SplitterBar.(Grid.ColumnSpan)" Value="1" />
109111
<Setter Target="SplitterBar.ResizeDirection" Value="Columns" />
112+
<!-- Workaround for https://github.com/CommunityToolkit/Windows/issues/748 -->
113+
<Setter Target="SplitterBar.Orientation" Value="Vertical" />
110114

111115
<Setter Target="SplitterCommandBarLeft.(Grid.Row)" Value="0" />
112116
<Setter Target="SplitterCommandBarLeft.(Grid.Column)" Value="1" />
113117
<Setter Target="SplitterCommandBarLeft.(Grid.RowSpan)" Value="3" />
114118
<Setter Target="SplitterCommandBarLeft.(Grid.ColumnSpan)" Value="1" />
115119
<Setter Target="SplitterCommandBarLeft.Orientation" Value="Vertical" />
116-
<Setter Target="SplitterCommandBarLeft.Margin" Value="0,0,0,200" />
120+
<Setter Target="SplitterCommandBarLeft.Margin" Value="0,0,0,260" />
117121

118122
<Setter Target="SplitterCommandBarRight.(Grid.Row)" Value="0" />
119123
<Setter Target="SplitterCommandBarRight.(Grid.Column)" Value="1" />
@@ -193,7 +197,7 @@
193197
<StackPanel x:Name="SplitterCommandBarLeft"
194198
Grid.Row="1"
195199
Grid.ColumnSpan="3"
196-
Margin="0,2,300,2"
200+
Margin="0,2,308,2"
197201
HorizontalAlignment="Center"
198202
VerticalAlignment="Center"
199203
Background="Transparent"
@@ -205,8 +209,9 @@
205209
Style="{StaticResource VSCodeAppBarHeaderButtonStyle}">
206210
<SymbolIcon fex:SymbolIconExtensions.FontSize="16" Symbol="Refresh" />
207211
</Button>
208-
<controls:Segmented SelectedIndex="0"
209-
SelectionChanged="Segmented_SelectionChanged"
212+
<controls:Segmented x:Name="DesignerModeSelector"
213+
SelectedIndex="0"
214+
SelectionChanged="DesignerModeSelector_SelectionChanged"
210215
SelectionMode="Single">
211216
<!-- TODO: Move Tooltip to Resources... -->
212217
<controls:SegmentedItem Icon="{ui:FontIcon Glyph=&#xE890;}"

0 commit comments

Comments
 (0)