Skip to content

Commit 2e3bb42

Browse files
authored
Fixed tab overhang (#209)
1 parent 74a871c commit 2e3bb42

3 files changed

Lines changed: 7 additions & 22 deletions

File tree

Code/XTMF.Gui/App.xaml

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@
138138
KeyboardNavigation.TabIndex="1" Panel.ZIndex="1"
139139
ItemTemplate="{TemplateBinding HeaderItemTemplate}"
140140
Style="{StaticResource TabablzDragablzItemsControlStyle}"
141-
Margin="1,0,1,-2"
142-
Padding="0">
141+
Margin="1,0,1,0"
142+
Padding="0">
143143
<dragablz:DragablzItemsControl.MaxWidth>
144144
<MultiBinding>
145145
<MultiBinding.Converter>
@@ -153,19 +153,7 @@
153153
</MultiBinding>
154154
</dragablz:DragablzItemsControl.MaxWidth>
155155
</dragablz:DragablzItemsControl>
156-
<Button Style="{StaticResource MaterialDesignAddItemCommandButtonStyle}"
157-
x:Name="DefaultAddButton"
158-
Grid.Column="2"
159-
Command="{x:Static dragablz:TabablzControl.AddItemCommand}"
160-
Visibility="{TemplateBinding ShowDefaultAddButton, Converter={StaticResource BooleanToVisibilityConverter}}"
161-
/>
162-
<ContentControl Grid.Column="3" x:Name="SuffixContentControl"
163-
Content="{TemplateBinding HeaderSuffixContent}"
164-
ContentStringFormat="{TemplateBinding HeaderSuffixContentStringFormat}"
165-
ContentTemplate="{TemplateBinding HeaderSuffixContentStringFormat}"
166-
ContentTemplateSelector="{TemplateBinding HeaderSuffixContentTemplateSelector}"
167-
HorizontalAlignment="Stretch"
168-
/>
156+
169157
</Grid>
170158
</Grid>
171159
<ControlTemplate.Triggers>
@@ -178,9 +166,6 @@
178166
<Trigger Property="IsEnabled" Value="false">
179167
<Setter Property="TextElement.Foreground" TargetName="templateRoot" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
180168
</Trigger>
181-
<Trigger Property="IsDraggingWindow" Value="True">
182-
<Setter TargetName="DefaultAddButton" Property="Visibility" Value="Hidden" />
183-
</Trigger>
184169
</ControlTemplate.Triggers>
185170
</ControlTemplate>
186171
</Setter.Value>

Code/XTMF.Gui/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<Border Name="WindowGrid" Margin="0,0,0,0" BorderBrush="{DynamicResource PrimaryHueMidBrush}" BorderThickness="0">
5959
<Grid>
6060
<materialDesign:DialogHost Identifier="RootDialog" CloseOnClickAway="True" Name="RootDialogHost" >
61-
<materialDesign:DrawerHost Name="DrawerHost" materialDesign:ShadowAssist.ShadowDepth="Depth4"
61+
<materialDesign:DrawerHost Name="DrawerHost" materialDesign:ElevationAssist.Elevation="Dp4"
6262
IsLeftDrawerOpen="{Binding ElementName=MenuToggleButton, Path=IsChecked}"
6363
PreviewKeyDown="DrawerHost_PreviewKeyDown">
6464
<Grid Name="ExternalGrid" Margin="0,0,0,0" Background="Transparent">

Code/XTMF.Gui/UserControls/StartWindow.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656
<RowDefinition Height="AUTO" MinHeight="0" />
5757
</Grid.RowDefinitions>
5858
<Grid.ColumnDefinitions>
59-
<ColumnDefinition Width="600" />
59+
<ColumnDefinition Width="400" />
6060
</Grid.ColumnDefinitions>
6161
<materialDesign:Card Grid.Row="0" Grid.Column="0" Padding="15" Margin="5">
6262
<StackPanel Orientation="Vertical" HorizontalAlignment="Left" Name="ProjectsStackPanel">
6363
<Label Content="Projects" FontSize="18" Foreground="{DynamicResource MaterialDesignBody}" />
64-
<Button HorizontalAlignment="Left" Style="{DynamicResource MaterialDesignFlatButton}" Content="Create a new project" Margin="0.25cm,0,0,0" FontSize="14" Click="ButtonBase_OnClick" />
65-
<Button HorizontalAlignment="Left" Style="{DynamicResource MaterialDesignFlatButton}" Content="Open a project" Margin="0.25cm,0,0,0" FontSize="14" Name="OpenProjectButton" Click="OpenProjectButton_OnClick" />
64+
<Button HorizontalAlignment="Left" Style="{DynamicResource MaterialDesignFlatButton}" Content="Create a new project" Margin="0.25cm,0,0,0" FontSize="14" Click="ButtonBase_OnClick" />
65+
<Button HorizontalAlignment="Left" Style="{DynamicResource MaterialDesignFlatButton}" Content="Open a project" Margin="0.25cm,0,0,0" FontSize="14" Name="OpenProjectButton" Click="OpenProjectButton_OnClick" />
6666
</StackPanel>
6767
</materialDesign:Card>
6868
<materialDesign:Card Grid.Row="1" Grid.Column="0" Padding="15" Margin="5">

0 commit comments

Comments
 (0)