WinGui: Fix log display in the GUI where the start of a log could be cut off. Fixes #326

2 files changed, 53 insertions, 40 deletions

diff --git a/win/CS/HandBrakeWPF/Views/MainView.xaml b/win/CS/HandBrakeWPF/Views/MainView.xaml
index db1ca8f9d..71be890df 100644
--- a/win/CS/HandBrakeWPF/Views/MainView.xaml
+++ b/win/CS/HandBrakeWPF/Views/MainView.xaml
@@ -599,63 +599,78 @@
                              Loaded="ToolBarLoaded"

                              KeyboardNavigation.TabNavigation="Continue"

                              >

-                        <Button cal:Message.Attach="[Event Click] = [Action PresetAdd]" AutomationProperties.Name="Add Preset">

-                            <Button.Content>

-                                <StackPanel Orientation="Horizontal">

-                                    <Image Width="20"

+

+                        <ToolBar.Resources>

+                            <Style TargetType="{x:Type ToolBarPanel}">

+                                <Setter Property="Orientation" Value="Vertical"/>

+                                <Setter Property="VerticalAlignment" Value="Center"/>

+                            </Style>

+

+                            <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />

+                        </ToolBar.Resources>

+

+                        <ToolBarOverflowPanel>

+                            <Button cal:Message.Attach="[Event Click] = [Action PresetAdd]" AutomationProperties.Name="Add Preset">

+                                <Button.Content>

+                                    <StackPanel Orientation="Horizontal">

+                                        <Image Width="20"

                                            Height="20"

                                            Source="Images/add.png"

                                            />

-                                    <TextBlock Margin="2,0,0,0"

+                                        <TextBlock Margin="2,0,0,0"

                                                VerticalAlignment="Center"

                                                Style="{StaticResource textBlockOrangeStyle}"

                                                Text="{x:Static Properties:ResourcesUI.Generic_Add}"

                                                />

-                                </StackPanel>

-                            </Button.Content>

-                        </Button>

-                        <Button cal:Message.Attach="[Event Click] = [Action PresetRemove]" AutomationProperties.Name="Remove Preset">

-                            <Button.Content>

-                                <StackPanel Orientation="Horizontal">

-                                    <Image Width="20"

+                                    </StackPanel>

+                                </Button.Content>

+                            </Button>

+

+                            <Button Background="Transparent" cal:Message.Attach="[Event Click] = [Action PresetRemove]" AutomationProperties.Name="Remove Preset">

+                                <Button.Content>

+                                    <StackPanel Orientation="Horizontal">

+                                        <Image Width="20"

                                            Height="20"

                                            Source="Images/remove.png"

                                            SnapsToDevicePixels="True"

                                            />

-                                    <TextBlock Margin="2,0,0,0"

+                                        <TextBlock Margin="2,0,0,0"

                                                VerticalAlignment="Center"

                                                Style="{StaticResource textBlockOrangeStyle}"

                                                Text="{x:Static Properties:ResourcesUI.MainView_Remove}"

                                                />

-                                </StackPanel>

-                            </Button.Content>

-                        </Button>

-                        <Menu Background="Transparent" AutomationProperties.Name="Preset Options Dropdown">

-                            <MenuItem ToolBar.OverflowMode="Never">

-                                <MenuItem.Header>

-                                    <StackPanel Orientation="Horizontal">

-                                        <Image Width="20"

+                                    </StackPanel>

+                                </Button.Content>

+                            </Button>

+

+                            <Menu Background="Transparent" AutomationProperties.Name="Preset Options Dropdown" MinHeight="22">

+                                <MenuItem ToolBar.OverflowMode="Never">

+                                    <MenuItem.Header>

+                                        <StackPanel Orientation="Horizontal">

+                                            <Image Width="20"

                                                Height="20"

                                                Source="Images/Advanced.png"

                                                 RenderOptions.BitmapScalingMode="HighQuality"

                                                />

-                                        <TextBlock Margin="2,0,0,0"

+                                            <TextBlock Margin="2,0,0,0"

                                                    VerticalAlignment="Center"

                                                    Style="{StaticResource textBlockOrangeStyle}"

                                                    Text="{x:Static Properties:ResourcesUI.MainView_Options}"

                                                    />

-                                    </StackPanel>

-                                </MenuItem.Header>

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />

-                                <Separator />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />

-                                <Separator />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />

-                                <Separator />

-                                <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />

-                            </MenuItem>

-                        </Menu>

+                                        </StackPanel>

+                                    </MenuItem.Header>

+                                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_SetDefault}" cal:Message.Attach="[Event Click] = [Action PresetSetDefault]" />

+                                    <Separator />

+                                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_UpdateSelectedPreset}" cal:Message.Attach="[Event Click] = [Action PresetUpdate]" />

+                                    <Separator />

+                                    <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Import}" cal:Message.Attach="[Event Click] = [Action PresetImport]" />

+                                    <MenuItem Header="{x:Static Properties:ResourcesUI.Preset_Export}" cal:Message.Attach="[Event Click] = [Action PresetExport]" />

+                                    <Separator />

+                                    <MenuItem Header="{x:Static Properties:ResourcesUI.MainView_ResetBuiltInPresets}" cal:Message.Attach="[Event Click] = [Action PresetReset]" />

+                                </MenuItem>

+                            </Menu>

+                        </ToolBarOverflowPanel>

+

                     </ToolBar>

                 </Grid>

             </GroupBox>

@@ -705,10 +720,10 @@
                 <TextBlock Text="{Binding Path=ProgramStatusLabel}" TextTrimming="CharacterEllipsis" />

             </StatusBarItem>

             <StatusBarItem HorizontalAlignment="Right" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_WhenDone}">

-                <Menu Background="Transparent">

+                <Menu Background="Transparent" >

                     <MenuItem>

                         <MenuItem.Header>

-                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal">

+                            <StackPanel VerticalAlignment="Center" Orientation="Horizontal" MinHeight="26">

                                 <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:ResourcesUI.QueueView_WhenDone}" />

                                 <TextBlock Margin="8,0,0,0" VerticalAlignment="Center" Text="{Binding QueueViewModel.WhenDoneAction}" />

                                 <Path Height="5"

diff --git a/win/CS/HandBrakeWPF/Views/QueueView.xaml b/win/CS/HandBrakeWPF/Views/QueueView.xaml
index 4a35cb02d..c1c00bb39 100644
--- a/win/CS/HandBrakeWPF/Views/QueueView.xaml
+++ b/win/CS/HandBrakeWPF/Views/QueueView.xaml
@@ -61,7 +61,6 @@
                 </Style>

 

                 <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />

-                <Style BasedOn="{StaticResource {x:Static ToolBar.MenuStyleKey}}" TargetType="{x:Type Menu}" />

             </ToolBar.Resources>

 

             <DockPanel Background="Transparent" HorizontalAlignment="Stretch">

@@ -97,7 +96,7 @@
                 </Button>

 

                 <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" HorizontalAlignment="Right">

-                    <Menu HorizontalAlignment="Right" Background="Transparent">

+                    <Menu HorizontalAlignment="Right" VerticalAlignment="Center" Background="Transparent">

                         <MenuItem>

                             <MenuItem.Header>

                                 <StackPanel Height="32" Orientation="Horizontal">

@@ -152,7 +151,7 @@
                         </MenuItem>

                     </Menu>

 

-                    <Menu HorizontalAlignment="Right" Background="Transparent">

+                    <Menu HorizontalAlignment="Right" Background="Transparent" VerticalAlignment="Center">

                         <MenuItem>

                             <MenuItem.Header>

                                 <StackPanel Height="32" Orientation="Horizontal">

@@ -177,7 +176,6 @@
 

                 </StackPanel>

 

-

             </DockPanel>

         </ToolBar>